diff src/share/vm/c1/c1_Runtime1.cpp @ 13188:6b2d8d20ecbd

deoptimization: add helper to minimize hsx diff #resolve GRAAL-531
author Bernhard Urban <bernhard.urban@jku.at>
date Thu, 28 Nov 2013 14:12:31 +0100
parents 096c224171c4
children b51e29501f30 52b4284cb496
line wrap: on
line diff
--- a/src/share/vm/c1/c1_Runtime1.cpp	Thu Nov 28 13:19:58 2013 +0100
+++ b/src/share/vm/c1/c1_Runtime1.cpp	Thu Nov 28 14:12:31 2013 +0100
@@ -169,7 +169,7 @@
     RegisterMap reg_map(thread, false);
     frame runtime_frame = thread->last_frame();
     frame caller_frame = runtime_frame.sender(&reg_map);
-    Deoptimization::deoptimize_frame(thread, caller_frame.id(), Deoptimization::Reason_constraint);
+    Deoptimization::deoptimize_frame(thread, caller_frame.id());
     assert(caller_is_deopted(), "Must be deoptimized");
   }
 }
@@ -431,7 +431,7 @@
     if (osr_nm != NULL) {
       RegisterMap map(thread, false);
       frame fr =  thread->last_frame().sender(&map);
-      Deoptimization::deoptimize_frame(thread, fr.id(), Deoptimization::Reason_constraint);
+      Deoptimization::deoptimize_frame(thread, fr.id());
     }
   JRT_BLOCK_END
   return NULL;
@@ -502,7 +502,7 @@
     // We don't really want to deoptimize the nmethod itself since we
     // can actually continue in the exception handler ourselves but I
     // don't see an easy way to have the desired effect.
-    Deoptimization::deoptimize_frame(thread, caller_frame.id(), Deoptimization::Reason_constraint);
+    Deoptimization::deoptimize_frame(thread, caller_frame.id());
     assert(caller_is_deopted(), "Must be deoptimized");
 
     return SharedRuntime::deopt_blob()->unpack_with_exception_in_tls();
@@ -696,7 +696,7 @@
   assert(CodeCache::find_nmethod(caller_frame.pc()) != NULL, "sanity");
 
   // Deoptimize the caller frame.
-  Deoptimization::deoptimize_frame(thread, caller_frame.id(), Deoptimization::Reason_constraint);
+  Deoptimization::deoptimize_frame(thread, caller_frame.id());
 
   // Return to the now deoptimized frame.
 JRT_END
@@ -932,7 +932,7 @@
       nm->make_not_entrant();
     }
 
-    Deoptimization::deoptimize_frame(thread, caller_frame.id(), Deoptimization::Reason_constraint);
+    Deoptimization::deoptimize_frame(thread, caller_frame.id());
 
     // Return to the now deoptimized frame.
   }
@@ -1434,7 +1434,7 @@
   }
 
 
-  Deoptimization::deoptimize_frame(thread, caller_frame.id(), Deoptimization::Reason_none);
+  Deoptimization::deoptimize_frame(thread, caller_frame.id());
 
 JRT_END