Mercurial > hg > graal-compiler
comparison src/share/vm/ci/ciEnv.cpp @ 8124:5fc51c1ecdeb
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Tue, 05 Mar 2013 23:44:54 +0100 |
parents | ce248dc0a656 f16e75e0cf11 |
children | b9a918201d47 |
comparison
equal
deleted
inserted
replaced
7943:a413bcd552a4 | 8124:5fc51c1ecdeb |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | 4 * |
5 * This code is free software; you can redistribute it and/or modify it | 5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as | 6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
50 #include "prims/jvmtiExport.hpp" | 50 #include "prims/jvmtiExport.hpp" |
51 #include "runtime/init.hpp" | 51 #include "runtime/init.hpp" |
52 #include "runtime/reflection.hpp" | 52 #include "runtime/reflection.hpp" |
53 #include "runtime/sharedRuntime.hpp" | 53 #include "runtime/sharedRuntime.hpp" |
54 #include "utilities/dtrace.hpp" | 54 #include "utilities/dtrace.hpp" |
55 #include "utilities/macros.hpp" | |
55 #ifdef COMPILER1 | 56 #ifdef COMPILER1 |
56 #include "c1/c1_Runtime1.hpp" | 57 #include "c1/c1_Runtime1.hpp" |
57 #endif | 58 #endif |
58 #ifdef COMPILER2 | 59 #ifdef COMPILER2 |
59 #include "opto/runtime.hpp" | 60 #include "opto/runtime.hpp" |
594 return ciConstant(); | 595 return ciConstant(); |
595 } | 596 } |
596 assert (klass->is_instance_klass() || klass->is_array_klass(), | 597 assert (klass->is_instance_klass() || klass->is_array_klass(), |
597 "must be an instance or array klass "); | 598 "must be an instance or array klass "); |
598 return ciConstant(T_OBJECT, klass->java_mirror()); | 599 return ciConstant(T_OBJECT, klass->java_mirror()); |
599 } else if (tag.is_object()) { | |
600 oop obj = cpool->object_at(index); | |
601 ciObject* ciobj = get_object(obj); | |
602 return ciConstant(T_OBJECT, ciobj); | |
603 } else if (tag.is_method_type()) { | 600 } else if (tag.is_method_type()) { |
604 // must execute Java code to link this CP entry into cache[i].f1 | 601 // must execute Java code to link this CP entry into cache[i].f1 |
605 ciSymbol* signature = get_symbol(cpool->method_type_signature_at(index)); | 602 ciSymbol* signature = get_symbol(cpool->method_type_signature_at(index)); |
606 ciObject* ciobj = get_unloaded_method_type_constant(signature); | 603 ciObject* ciobj = get_unloaded_method_type_constant(signature); |
607 return ciConstant(T_OBJECT, ciobj); | 604 return ciConstant(T_OBJECT, ciobj); |
1166 } | 1163 } |
1167 | 1164 |
1168 | 1165 |
1169 void ciEnv::dump_replay_data(outputStream* out) { | 1166 void ciEnv::dump_replay_data(outputStream* out) { |
1170 ASSERT_IN_VM; | 1167 ASSERT_IN_VM; |
1171 | 1168 ResourceMark rm; |
1172 #if INCLUDE_JVMTI | 1169 #if INCLUDE_JVMTI |
1173 out->print_cr("JvmtiExport can_access_local_variables %d", _jvmti_can_access_local_variables); | 1170 out->print_cr("JvmtiExport can_access_local_variables %d", _jvmti_can_access_local_variables); |
1174 out->print_cr("JvmtiExport can_hotswap_or_post_breakpoint %d", _jvmti_can_hotswap_or_post_breakpoint); | 1171 out->print_cr("JvmtiExport can_hotswap_or_post_breakpoint %d", _jvmti_can_hotswap_or_post_breakpoint); |
1175 out->print_cr("JvmtiExport can_post_on_exceptions %d", _jvmti_can_post_on_exceptions); | 1172 out->print_cr("JvmtiExport can_post_on_exceptions %d", _jvmti_can_post_on_exceptions); |
1176 #endif // INCLUDE_JVMTI | 1173 #endif // INCLUDE_JVMTI |