Mercurial > hg > truffle
diff src/share/vm/ci/ciMethod.cpp @ 14909:4ca6dc0799b6
Backout jdk9 merge
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Tue, 01 Apr 2014 13:57:07 +0200 |
parents | d8041d695d19 |
children | 89152779163c |
line wrap: on
line diff
--- a/src/share/vm/ci/ciMethod.cpp Tue Apr 01 14:09:03 2014 +0200 +++ b/src/share/vm/ci/ciMethod.cpp Tue Apr 01 13:57:07 2014 +0200 @@ -412,7 +412,7 @@ // information. MethodLivenessResult ciMethod::liveness_at_bci(int bci) { MethodLivenessResult result = raw_liveness_at_bci(bci); - if (CURRENT_ENV->should_retain_local_variables() || DeoptimizeALot || CompileTheWorld) { + if (CURRENT_ENV->jvmti_can_access_local_variables() || DeoptimizeALot || CompileTheWorld) { // Keep all locals live for the user's edification and amusement. result.at_put_range(0, result.size(), true); } @@ -1357,21 +1357,15 @@ #undef FETCH_FLAG_FROM_VM -void ciMethod::dump_name_as_ascii(outputStream* st) { - Method* method = get_Method(); - st->print("%s %s %s", - method->klass_name()->as_quoted_ascii(), - method->name()->as_quoted_ascii(), - method->signature()->as_quoted_ascii()); -} - void ciMethod::dump_replay_data(outputStream* st) { ResourceMark rm; Method* method = get_Method(); MethodCounters* mcs = method->method_counters(); - st->print("ciMethod "); - dump_name_as_ascii(st); - st->print_cr(" %d %d %d %d %d", + Klass* holder = method->method_holder(); + st->print_cr("ciMethod %s %s %s %d %d %d %d %d", + holder->name()->as_quoted_ascii(), + method->name()->as_quoted_ascii(), + method->signature()->as_quoted_ascii(), mcs == NULL ? 0 : mcs->invocation_counter()->raw_counter(), mcs == NULL ? 0 : mcs->backedge_counter()->raw_counter(), interpreter_invocation_count(),