# HG changeset patch
# User vlivanov
# Date 1366990419 25200
# Node ID 93b8272814cf7dfbf8ea51cf74b728e85424f445
# Parent  a5c95fcf7cb720d8eedf39d8f8827df17c4f96d1# Parent  d1c9384eecb4772fcd6b86df75dc95f2e74b11a1
Merge

diff -r d1c9384eecb4 -r 93b8272814cf src/share/vm/ci/ciMethod.hpp
--- 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();
 
diff -r d1c9384eecb4 -r 93b8272814cf src/share/vm/runtime/sharedRuntime.cpp
--- 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(&reg_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();