1.1 --- a/src/share/vm/ci/ciMethod.cpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/ci/ciMethod.cpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -29,7 +29,6 @@
1.4 #include "ci/ciMethod.hpp"
1.5 #include "ci/ciMethodBlocks.hpp"
1.6 #include "ci/ciMethodData.hpp"
1.7 -#include "ci/ciMethodKlass.hpp"
1.8 #include "ci/ciStreams.hpp"
1.9 #include "ci/ciSymbol.hpp"
1.10 #include "ci/ciUtilities.hpp"
1.11 @@ -51,16 +50,16 @@
1.12 #ifdef COMPILER2
1.13 #include "ci/bcEscapeAnalyzer.hpp"
1.14 #include "ci/ciTypeFlow.hpp"
1.15 -#include "oops/methodOop.hpp"
1.16 +#include "oops/method.hpp"
1.17 #endif
1.18 #ifdef SHARK
1.19 #include "ci/ciTypeFlow.hpp"
1.20 -#include "oops/methodOop.hpp"
1.21 +#include "oops/method.hpp"
1.22 #endif
1.23
1.24 // ciMethod
1.25 //
1.26 -// This class represents a methodOop in the HotSpot virtual
1.27 +// This class represents a Method* in the HotSpot virtual
1.28 // machine.
1.29
1.30
1.31 @@ -68,7 +67,7 @@
1.32 // ciMethod::ciMethod
1.33 //
1.34 // Loaded method.
1.35 -ciMethod::ciMethod(methodHandle h_m) : ciObject(h_m) {
1.36 +ciMethod::ciMethod(methodHandle h_m) : ciMetadata(h_m()) {
1.37 assert(h_m() != NULL, "no null method");
1.38
1.39 // These fields are always filled in in loaded methods.
1.40 @@ -106,7 +105,7 @@
1.41 CHECK_UNHANDLED_OOPS_ONLY(Thread::current()->clear_unhandled_oops());
1.42 }
1.43
1.44 - if (instanceKlass::cast(h_m()->method_holder())->is_linked()) {
1.45 + if (InstanceKlass::cast(h_m()->method_holder())->is_linked()) {
1.46 _can_be_statically_bound = h_m()->can_be_statically_bound();
1.47 } else {
1.48 // Have to use a conservative value in this case.
1.49 @@ -123,7 +122,7 @@
1.50 // generating _signature may allow GC and therefore move m.
1.51 // These fields are always filled in.
1.52 _name = env->get_symbol(h_m()->name());
1.53 - _holder = env->get_object(h_m()->method_holder())->as_instance_klass();
1.54 + _holder = env->get_instance_klass(h_m()->method_holder());
1.55 ciSymbol* sig_symbol = env->get_symbol(h_m()->signature());
1.56 constantPoolHandle cpool = h_m()->constants();
1.57 _signature = new (env->arena()) ciSignature(_holder, cpool, sig_symbol);
1.58 @@ -151,7 +150,7 @@
1.59 ciSymbol* name,
1.60 ciSymbol* signature,
1.61 ciInstanceKlass* accessor) :
1.62 - ciObject(ciMethodKlass::make()),
1.63 + ciMetadata((Metadata*)NULL),
1.64 _name( name),
1.65 _holder( holder),
1.66 _intrinsic_id( vmIntrinsics::_none),
1.67 @@ -180,7 +179,7 @@
1.68 VM_ENTRY_MARK;
1.69 assert(is_loaded(), "only loaded methods have code");
1.70
1.71 - methodOop me = get_methodOop();
1.72 + Method* me = get_Method();
1.73 Arena* arena = CURRENT_THREAD_ENV->arena();
1.74
1.75 // Load the bytecodes.
1.76 @@ -189,7 +188,7 @@
1.77
1.78 // Revert any breakpoint bytecodes in ci's copy
1.79 if (me->number_of_breakpoints() > 0) {
1.80 - BreakpointInfo* bp = instanceKlass::cast(me->method_holder())->breakpoints();
1.81 + BreakpointInfo* bp = InstanceKlass::cast(me->method_holder())->breakpoints();
1.82 for (; bp != NULL; bp = bp->next()) {
1.83 if (bp->match(me)) {
1.84 code_at_put(bp->bci(), bp->orig_bytecode());
1.85 @@ -236,7 +235,7 @@
1.86 bool ciMethod::has_linenumber_table() const {
1.87 check_is_loaded();
1.88 VM_ENTRY_MARK;
1.89 - return get_methodOop()->has_linenumber_table();
1.90 + return get_Method()->has_linenumber_table();
1.91 }
1.92
1.93
1.94 @@ -245,7 +244,7 @@
1.95 u_char* ciMethod::compressed_linenumber_table() const {
1.96 check_is_loaded();
1.97 VM_ENTRY_MARK;
1.98 - return get_methodOop()->compressed_linenumber_table();
1.99 + return get_Method()->compressed_linenumber_table();
1.100 }
1.101
1.102
1.103 @@ -254,7 +253,7 @@
1.104 int ciMethod::line_number_from_bci(int bci) const {
1.105 check_is_loaded();
1.106 VM_ENTRY_MARK;
1.107 - return get_methodOop()->line_number_from_bci(bci);
1.108 + return get_Method()->line_number_from_bci(bci);
1.109 }
1.110
1.111
1.112 @@ -266,7 +265,7 @@
1.113 check_is_loaded();
1.114 assert(holder()->is_linked(), "must be linked");
1.115 VM_ENTRY_MARK;
1.116 - return get_methodOop()->vtable_index();
1.117 + return get_Method()->vtable_index();
1.118 }
1.119
1.120
1.121 @@ -279,7 +278,7 @@
1.122 check_is_loaded();
1.123 assert(holder()->is_linked(), "must be linked");
1.124 VM_ENTRY_MARK;
1.125 - return klassItable::compute_itable_index(get_methodOop());
1.126 + return klassItable::compute_itable_index(get_Method());
1.127 }
1.128 #endif // SHARK
1.129
1.130 @@ -292,7 +291,7 @@
1.131 check_is_loaded();
1.132 assert(flags().is_native(), "must be native method");
1.133 VM_ENTRY_MARK;
1.134 - methodOop method = get_methodOop();
1.135 + Method* method = get_Method();
1.136 address entry = method->native_function();
1.137 assert(entry != NULL, "must be valid entry point");
1.138 return entry;
1.139 @@ -306,7 +305,7 @@
1.140 address ciMethod::interpreter_entry() {
1.141 check_is_loaded();
1.142 VM_ENTRY_MARK;
1.143 - methodHandle mh(THREAD, get_methodOop());
1.144 + methodHandle mh(THREAD, get_Method());
1.145 return Interpreter::entry_for_method(mh);
1.146 }
1.147
1.148 @@ -321,7 +320,7 @@
1.149
1.150 // Analyze the method to see if monitors are used properly.
1.151 VM_ENTRY_MARK;
1.152 - methodHandle method(THREAD, get_methodOop());
1.153 + methodHandle method(THREAD, get_Method());
1.154 assert(method->has_monitor_bytecodes(), "should have checked this");
1.155
1.156 // Check to see if a previous compilation computed the
1.157 @@ -426,7 +425,7 @@
1.158 BitMap ciMethod::live_local_oops_at_bci(int bci) {
1.159 VM_ENTRY_MARK;
1.160 InterpreterOopMap mask;
1.161 - OopMapCache::compute_one_oop_map(get_methodOop(), bci, &mask);
1.162 + OopMapCache::compute_one_oop_map(get_Method(), bci, &mask);
1.163 int mask_size = max_locals();
1.164 BitMap result(mask_size);
1.165 result.clear();
1.166 @@ -607,16 +606,16 @@
1.167 methodHandle target;
1.168 {
1.169 MutexLocker locker(Compile_lock);
1.170 - klassOop context = actual_recv->get_klassOop();
1.171 + Klass* context = actual_recv->get_Klass();
1.172 target = Dependencies::find_unique_concrete_method(context,
1.173 - root_m->get_methodOop());
1.174 + root_m->get_Method());
1.175 // %%% Should upgrade this ciMethod API to look for 1 or 2 concrete methods.
1.176 }
1.177
1.178 #ifndef PRODUCT
1.179 - if (TraceDependencies && target() != NULL && target() != root_m->get_methodOop()) {
1.180 + if (TraceDependencies && target() != NULL && target() != root_m->get_Method()) {
1.181 tty->print("found a non-root unique target method");
1.182 - tty->print_cr(" context = %s", instanceKlass::cast(actual_recv->get_klassOop())->external_name());
1.183 + tty->print_cr(" context = %s", InstanceKlass::cast(actual_recv->get_Klass())->external_name());
1.184 tty->print(" method = ");
1.185 target->print_short_name(tty);
1.186 tty->cr();
1.187 @@ -626,7 +625,7 @@
1.188 if (target() == NULL) {
1.189 return NULL;
1.190 }
1.191 - if (target() == root_m->get_methodOop()) {
1.192 + if (target() == root_m->get_Method()) {
1.193 return root_m;
1.194 }
1.195 if (!root_m->is_public() &&
1.196 @@ -640,7 +639,7 @@
1.197 // with the same name but different vtable indexes.
1.198 return NULL;
1.199 }
1.200 - return CURRENT_THREAD_ENV->get_object(target())->as_method();
1.201 + return CURRENT_THREAD_ENV->get_method(target());
1.202 }
1.203
1.204 // ------------------------------------------------------------------
1.205 @@ -652,18 +651,18 @@
1.206 check_is_loaded();
1.207 VM_ENTRY_MARK;
1.208
1.209 - KlassHandle caller_klass (THREAD, caller->get_klassOop());
1.210 - KlassHandle h_recv (THREAD, exact_receiver->get_klassOop());
1.211 - KlassHandle h_resolved (THREAD, holder()->get_klassOop());
1.212 + KlassHandle caller_klass (THREAD, caller->get_Klass());
1.213 + KlassHandle h_recv (THREAD, exact_receiver->get_Klass());
1.214 + KlassHandle h_resolved (THREAD, holder()->get_Klass());
1.215 Symbol* h_name = name()->get_symbol();
1.216 Symbol* h_signature = signature()->get_symbol();
1.217
1.218 methodHandle m;
1.219 // Only do exact lookup if receiver klass has been linked. Otherwise,
1.220 // the vtable has not been setup, and the LinkResolver will fail.
1.221 - if (h_recv->oop_is_javaArray()
1.222 + if (h_recv->oop_is_array()
1.223 ||
1.224 - instanceKlass::cast(h_recv())->is_linked() && !exact_receiver->is_interface()) {
1.225 + InstanceKlass::cast(h_recv())->is_linked() && !exact_receiver->is_interface()) {
1.226 if (holder()->is_interface()) {
1.227 m = LinkResolver::resolve_interface_call_or_null(h_recv, h_resolved, h_name, h_signature, caller_klass);
1.228 } else {
1.229 @@ -677,8 +676,8 @@
1.230 }
1.231
1.232 ciMethod* result = this;
1.233 - if (m() != get_methodOop()) {
1.234 - result = CURRENT_THREAD_ENV->get_object(m())->as_method();
1.235 + if (m() != get_Method()) {
1.236 + result = CURRENT_THREAD_ENV->get_method(m());
1.237 }
1.238
1.239 // Don't return abstract methods because they aren't
1.240 @@ -694,11 +693,11 @@
1.241 // ciMethod::resolve_vtable_index
1.242 //
1.243 // Given a known receiver klass, find the vtable index for the call.
1.244 -// Return methodOopDesc::invalid_vtable_index if the vtable_index is unknown.
1.245 +// Return Method::invalid_vtable_index if the vtable_index is unknown.
1.246 int ciMethod::resolve_vtable_index(ciKlass* caller, ciKlass* receiver) {
1.247 check_is_loaded();
1.248
1.249 - int vtable_index = methodOopDesc::invalid_vtable_index;
1.250 + int vtable_index = Method::invalid_vtable_index;
1.251 // Only do lookup if receiver klass has been linked. Otherwise,
1.252 // the vtable has not been setup, and the LinkResolver will fail.
1.253 if (!receiver->is_interface()
1.254 @@ -706,15 +705,15 @@
1.255 receiver->as_instance_klass()->is_linked())) {
1.256 VM_ENTRY_MARK;
1.257
1.258 - KlassHandle caller_klass (THREAD, caller->get_klassOop());
1.259 - KlassHandle h_recv (THREAD, receiver->get_klassOop());
1.260 + KlassHandle caller_klass (THREAD, caller->get_Klass());
1.261 + KlassHandle h_recv (THREAD, receiver->get_Klass());
1.262 Symbol* h_name = name()->get_symbol();
1.263 Symbol* h_signature = signature()->get_symbol();
1.264
1.265 vtable_index = LinkResolver::resolve_virtual_vtable_index(h_recv, h_recv, h_name, h_signature, caller_klass);
1.266 - if (vtable_index == methodOopDesc::nonvirtual_vtable_index) {
1.267 + if (vtable_index == Method::nonvirtual_vtable_index) {
1.268 // A statically bound method. Return "no such index".
1.269 - vtable_index = methodOopDesc::invalid_vtable_index;
1.270 + vtable_index = Method::invalid_vtable_index;
1.271 }
1.272 }
1.273
1.274 @@ -803,19 +802,19 @@
1.275 // ------------------------------------------------------------------
1.276 // ciMethod::ensure_method_data
1.277 //
1.278 -// Generate new methodDataOop objects at compile time.
1.279 +// Generate new MethodData* objects at compile time.
1.280 // Return true if allocation was successful or no MDO is required.
1.281 bool ciMethod::ensure_method_data(methodHandle h_m) {
1.282 EXCEPTION_CONTEXT;
1.283 if (is_native() || is_abstract() || h_m()->is_accessor()) return true;
1.284 if (h_m()->method_data() == NULL) {
1.285 - methodOopDesc::build_interpreter_method_data(h_m, THREAD);
1.286 + Method::build_interpreter_method_data(h_m, THREAD);
1.287 if (HAS_PENDING_EXCEPTION) {
1.288 CLEAR_PENDING_EXCEPTION;
1.289 }
1.290 }
1.291 if (h_m()->method_data() != NULL) {
1.292 - _method_data = CURRENT_ENV->get_object(h_m()->method_data())->as_method_data();
1.293 + _method_data = CURRENT_ENV->get_method_data(h_m()->method_data());
1.294 _method_data->load_data();
1.295 return true;
1.296 } else {
1.297 @@ -829,7 +828,7 @@
1.298 bool result = true;
1.299 if (_method_data == NULL || _method_data->is_empty()) {
1.300 GUARDED_VM_ENTRY({
1.301 - result = ensure_method_data(get_methodOop());
1.302 + result = ensure_method_data(get_Method());
1.303 });
1.304 }
1.305 return result;
1.306 @@ -846,10 +845,10 @@
1.307 VM_ENTRY_MARK;
1.308 ciEnv* env = CURRENT_ENV;
1.309 Thread* my_thread = JavaThread::current();
1.310 - methodHandle h_m(my_thread, get_methodOop());
1.311 + methodHandle h_m(my_thread, get_Method());
1.312
1.313 if (h_m()->method_data() != NULL) {
1.314 - _method_data = CURRENT_ENV->get_object(h_m()->method_data())->as_method_data();
1.315 + _method_data = CURRENT_ENV->get_method_data(h_m()->method_data());
1.316 _method_data->load_data();
1.317 } else {
1.318 _method_data = CURRENT_ENV->get_empty_methodData();
1.319 @@ -894,7 +893,7 @@
1.320 bool ciMethod::should_exclude() {
1.321 check_is_loaded();
1.322 VM_ENTRY_MARK;
1.323 - methodHandle mh(THREAD, get_methodOop());
1.324 + methodHandle mh(THREAD, get_Method());
1.325 bool ignore;
1.326 return CompilerOracle::should_exclude(mh, ignore);
1.327 }
1.328 @@ -906,7 +905,7 @@
1.329 bool ciMethod::should_inline() {
1.330 check_is_loaded();
1.331 VM_ENTRY_MARK;
1.332 - methodHandle mh(THREAD, get_methodOop());
1.333 + methodHandle mh(THREAD, get_Method());
1.334 return CompilerOracle::should_inline(mh);
1.335 }
1.336
1.337 @@ -917,7 +916,7 @@
1.338 bool ciMethod::should_not_inline() {
1.339 check_is_loaded();
1.340 VM_ENTRY_MARK;
1.341 - methodHandle mh(THREAD, get_methodOop());
1.342 + methodHandle mh(THREAD, get_Method());
1.343 return CompilerOracle::should_not_inline(mh);
1.344 }
1.345
1.346 @@ -928,7 +927,7 @@
1.347 bool ciMethod::should_print_assembly() {
1.348 check_is_loaded();
1.349 VM_ENTRY_MARK;
1.350 - methodHandle mh(THREAD, get_methodOop());
1.351 + methodHandle mh(THREAD, get_Method());
1.352 return CompilerOracle::should_print(mh);
1.353 }
1.354
1.355 @@ -940,7 +939,7 @@
1.356 bool ciMethod::break_at_execute() {
1.357 check_is_loaded();
1.358 VM_ENTRY_MARK;
1.359 - methodHandle mh(THREAD, get_methodOop());
1.360 + methodHandle mh(THREAD, get_Method());
1.361 return CompilerOracle::should_break_at(mh);
1.362 }
1.363
1.364 @@ -950,7 +949,7 @@
1.365 bool ciMethod::has_option(const char* option) {
1.366 check_is_loaded();
1.367 VM_ENTRY_MARK;
1.368 - methodHandle mh(THREAD, get_methodOop());
1.369 + methodHandle mh(THREAD, get_Method());
1.370 return CompilerOracle::has_option_string(mh, option);
1.371 }
1.372
1.373 @@ -980,7 +979,7 @@
1.374 } else {
1.375 _is_c2_compilable = false;
1.376 }
1.377 - get_methodOop()->set_not_compilable(env->comp_level());
1.378 + get_Method()->set_not_compilable(env->comp_level());
1.379 }
1.380
1.381 // ------------------------------------------------------------------
1.382 @@ -995,20 +994,20 @@
1.383 check_is_loaded();
1.384 VM_ENTRY_MARK;
1.385 ciEnv* env = CURRENT_ENV;
1.386 - return !get_methodOop()->is_not_osr_compilable(env->comp_level());
1.387 + return !get_Method()->is_not_osr_compilable(env->comp_level());
1.388 }
1.389
1.390 // ------------------------------------------------------------------
1.391 // ciMethod::has_compiled_code
1.392 bool ciMethod::has_compiled_code() {
1.393 VM_ENTRY_MARK;
1.394 - return get_methodOop()->code() != NULL;
1.395 + return get_Method()->code() != NULL;
1.396 }
1.397
1.398 int ciMethod::comp_level() {
1.399 check_is_loaded();
1.400 VM_ENTRY_MARK;
1.401 - nmethod* nm = get_methodOop()->code();
1.402 + nmethod* nm = get_Method()->code();
1.403 if (nm != NULL) return nm->comp_level();
1.404 return 0;
1.405 }
1.406 @@ -1016,7 +1015,7 @@
1.407 int ciMethod::highest_osr_comp_level() {
1.408 check_is_loaded();
1.409 VM_ENTRY_MARK;
1.410 - return get_methodOop()->highest_osr_comp_level();
1.411 + return get_Method()->highest_osr_comp_level();
1.412 }
1.413
1.414 // ------------------------------------------------------------------
1.415 @@ -1026,7 +1025,7 @@
1.416 // size of 1 for methods which has the ForceInline annotation.
1.417 int ciMethod::code_size_for_inlining() {
1.418 check_is_loaded();
1.419 - if (get_methodOop()->force_inline()) {
1.420 + if (get_Method()->force_inline()) {
1.421 return 1;
1.422 }
1.423 return code_size();
1.424 @@ -1042,7 +1041,7 @@
1.425 // specific accessor nmethod::insts_size.
1.426 int ciMethod::instructions_size(int comp_level) {
1.427 GUARDED_VM_ENTRY(
1.428 - nmethod* code = get_methodOop()->code();
1.429 + nmethod* code = get_Method()->code();
1.430 if (code != NULL && (comp_level == CompLevel_any || comp_level == code->comp_level())) {
1.431 return code->insts_end() - code->verified_entry_point();
1.432 }
1.433 @@ -1054,7 +1053,7 @@
1.434 // ciMethod::log_nmethod_identity
1.435 void ciMethod::log_nmethod_identity(xmlStream* log) {
1.436 GUARDED_VM_ENTRY(
1.437 - nmethod* code = get_methodOop()->code();
1.438 + nmethod* code = get_Method()->code();
1.439 if (code != NULL) {
1.440 code->log_identity(log);
1.441 }
1.442 @@ -1067,14 +1066,14 @@
1.443 check_is_loaded();
1.444 VM_ENTRY_MARK;
1.445 return Interpreter::is_not_reached(
1.446 - methodHandle(THREAD, get_methodOop()), bci);
1.447 + methodHandle(THREAD, get_Method()), bci);
1.448 }
1.449
1.450 // ------------------------------------------------------------------
1.451 // ciMethod::was_never_executed
1.452 bool ciMethod::was_executed_more_than(int times) {
1.453 VM_ENTRY_MARK;
1.454 - return get_methodOop()->was_executed_more_than(times);
1.455 + return get_Method()->was_executed_more_than(times);
1.456 }
1.457
1.458 // ------------------------------------------------------------------
1.459 @@ -1083,8 +1082,8 @@
1.460 VM_ENTRY_MARK;
1.461 {
1.462 EXCEPTION_MARK;
1.463 - methodHandle m(THREAD, get_methodOop());
1.464 - bool has_unloaded = methodOopDesc::has_unloaded_classes_in_signature(m, (JavaThread *)THREAD);
1.465 + methodHandle m(THREAD, get_Method());
1.466 + bool has_unloaded = Method::has_unloaded_classes_in_signature(m, (JavaThread *)THREAD);
1.467 if( HAS_PENDING_EXCEPTION ) {
1.468 CLEAR_PENDING_EXCEPTION;
1.469 return true; // Declare that we may have unloaded classes
1.470 @@ -1097,7 +1096,7 @@
1.471 // ciMethod::is_klass_loaded
1.472 bool ciMethod::is_klass_loaded(int refinfo_index, bool must_be_resolved) const {
1.473 VM_ENTRY_MARK;
1.474 - return get_methodOop()->is_klass_loaded(refinfo_index, must_be_resolved);
1.475 + return get_Method()->is_klass_loaded(refinfo_index, must_be_resolved);
1.476 }
1.477
1.478 // ------------------------------------------------------------------
1.479 @@ -1107,7 +1106,7 @@
1.480 {
1.481 EXCEPTION_MARK;
1.482 HandleMark hm(THREAD);
1.483 - constantPoolHandle pool (THREAD, get_methodOop()->constants());
1.484 + constantPoolHandle pool (THREAD, get_Method()->constants());
1.485 methodHandle spec_method;
1.486 KlassHandle spec_klass;
1.487 Bytecodes::Code code = (is_static ? Bytecodes::_invokestatic : Bytecodes::_invokevirtual);
1.488 @@ -1128,14 +1127,14 @@
1.489 // Print the bytecodes for this method.
1.490 void ciMethod::print_codes_on(outputStream* st) {
1.491 check_is_loaded();
1.492 - GUARDED_VM_ENTRY(get_methodOop()->print_codes_on(st);)
1.493 + GUARDED_VM_ENTRY(get_Method()->print_codes_on(st);)
1.494 }
1.495
1.496
1.497 #define FETCH_FLAG_FROM_VM(flag_accessor) { \
1.498 check_is_loaded(); \
1.499 VM_ENTRY_MARK; \
1.500 - return get_methodOop()->flag_accessor(); \
1.501 + return get_Method()->flag_accessor(); \
1.502 }
1.503
1.504 bool ciMethod::is_empty_method() const { FETCH_FLAG_FROM_VM(is_empty_method); }
1.505 @@ -1174,7 +1173,7 @@
1.506 // Print a range of the bytecodes for this method.
1.507 void ciMethod::print_codes_on(int from, int to, outputStream* st) {
1.508 check_is_loaded();
1.509 - GUARDED_VM_ENTRY(get_methodOop()->print_codes_on(from, to, st);)
1.510 + GUARDED_VM_ENTRY(get_Method()->print_codes_on(from, to, st);)
1.511 }
1.512
1.513 // ------------------------------------------------------------------
1.514 @@ -1183,7 +1182,7 @@
1.515 // Print the name of this method, including signature and some flags.
1.516 void ciMethod::print_name(outputStream* st) {
1.517 check_is_loaded();
1.518 - GUARDED_VM_ENTRY(get_methodOop()->print_name(st);)
1.519 + GUARDED_VM_ENTRY(get_Method()->print_name(st);)
1.520 }
1.521
1.522 // ------------------------------------------------------------------
1.523 @@ -1192,7 +1191,7 @@
1.524 // Print the name of this method, without signature.
1.525 void ciMethod::print_short_name(outputStream* st) {
1.526 if (is_loaded()) {
1.527 - GUARDED_VM_ENTRY(get_methodOop()->print_short_name(st););
1.528 + GUARDED_VM_ENTRY(get_Method()->print_short_name(st););
1.529 } else {
1.530 // Fall back if method is not loaded.
1.531 holder()->print_name_on(st);
1.532 @@ -1208,7 +1207,7 @@
1.533 //
1.534 // Implementation of the print method.
1.535 void ciMethod::print_impl(outputStream* st) {
1.536 - ciObject::print_impl(st);
1.537 + ciMetadata::print_impl(st);
1.538 st->print(" name=");
1.539 name()->print_symbol_on(st);
1.540 st->print(" holder=");
