Mercurial > hg > graal-compiler
changeset 10201:93b8272814cf
Merge
author | vlivanov |
---|---|
date | Fri, 26 Apr 2013 08:33:39 -0700 |
parents | a5c95fcf7cb7 (diff) d1c9384eecb4 (current diff) |
children | fd49109d0d88 487d442ef257 |
files | |
diffstat | 2 files changed, 0 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/ci/ciMethod.hpp Fri Apr 26 07:21:41 2013 -0700 +++ b/src/share/vm/ci/ciMethod.hpp Fri Apr 26 08:33:39 2013 -0700 @@ -196,7 +196,6 @@ // Analysis and profiling. // // Usage note: liveness_at_bci and init_vars should be wrapped in ResourceMarks. - bool uses_monitors() const { return _uses_monitors; } // this one should go away, it has a misleading name bool has_monitor_bytecodes() const { return _uses_monitors; } bool has_balanced_monitors();
--- a/src/share/vm/runtime/sharedRuntime.cpp Fri Apr 26 07:21:41 2013 -0700 +++ b/src/share/vm/runtime/sharedRuntime.cpp Fri Apr 26 08:33:39 2013 -0700 @@ -1316,12 +1316,6 @@ assert(stub_frame.is_runtime_frame(), "sanity check"); frame caller_frame = stub_frame.sender(®_map); - // MethodHandle invokes don't have a CompiledIC and should always - // simply redispatch to the callee_target. - address sender_pc = caller_frame.pc(); - CodeBlob* sender_cb = caller_frame.cb(); - nmethod* sender_nm = sender_cb->as_nmethod_or_null(); - if (caller_frame.is_interpreted_frame() || caller_frame.is_entry_frame()) { Method* callee = thread->callee_target();