# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1416232719 -3600
# Node ID 810222d74f7ccaf6a1630ea6435265fef8f66e2a
# Parent  ce15cc6af5fec51155bfc56ae4228ec5aa37f6c1
When deoptimizing on unwind, revoke biases instead of calling deoptimize_frame before returning deopt continuation

diff -r ce15cc6af5fe -r 810222d74f7c src/share/vm/runtime/deoptimization.hpp
--- a/src/share/vm/runtime/deoptimization.hpp	Mon Nov 17 11:51:08 2014 +0100
+++ b/src/share/vm/runtime/deoptimization.hpp	Mon Nov 17 14:58:39 2014 +0100
@@ -130,13 +130,13 @@
   static void deoptimize(JavaThread* thread, frame fr, RegisterMap *reg_map);
   static void deoptimize(JavaThread* thread, frame fr, RegisterMap *reg_map, DeoptReason reason);
 
+  // Helper function to revoke biases of all monitors in frame if UseBiasedLocking
+  // is enabled
+  static void revoke_biases_of_monitors(JavaThread* thread, frame fr, RegisterMap* map);
+
   private:
   // Does the actual work for deoptimizing a single frame
   static void deoptimize_single_frame(JavaThread* thread, frame fr, DeoptReason reason);
-
-  // Helper function to revoke biases of all monitors in frame if UseBiasedLocking
-  // is enabled
-  static void revoke_biases_of_monitors(JavaThread* thread, frame fr, RegisterMap* map);
   // Helper function to revoke biases of all monitors in frames
   // executing in a particular CodeBlob if UseBiasedLocking is enabled
   static void revoke_biases_of_monitors(CodeBlob* cb);
diff -r ce15cc6af5fe -r 810222d74f7c src/share/vm/runtime/sharedRuntime.cpp
--- a/src/share/vm/runtime/sharedRuntime.cpp	Mon Nov 17 11:51:08 2014 +0100
+++ b/src/share/vm/runtime/sharedRuntime.cpp	Mon Nov 17 14:58:39 2014 +0100
@@ -663,7 +663,9 @@
       RegisterMap reg_map(thread);
       frame runtime_frame = thread->last_frame();
       frame caller_frame = runtime_frame.sender(&reg_map);
-      Deoptimization::deoptimize_frame(thread, caller_frame.id(), Deoptimization::Reason_not_compiled_exception_handler);
+      assert(caller_frame.is_compiled_frame() && !caller_frame.is_deoptimized_frame(),"should be called by compiled frame");
+      Deoptimization::revoke_biases_of_monitors(thread, caller_frame, &reg_map);
+
       return SharedRuntime::deopt_blob()->unpack_with_exception_in_tls();
     }
   }