changeset 7485:4fc2763e670e

Another merge fix.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Wed, 16 Jan 2013 15:39:59 +0100
parents 69318374c8d7
children 921bde171d1d
files src/share/vm/opto/runtime.cpp
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/opto/runtime.cpp	Wed Jan 16 14:41:15 2013 +0100
+++ b/src/share/vm/opto/runtime.cpp	Wed Jan 16 15:39:59 2013 +0100
@@ -1158,7 +1158,7 @@
   frame caller_frame = stub_frame.sender(&reg_map);
 
   // Deoptimize the caller frame.
-  Deoptimization::deoptimize_frame(thread, caller_frame.id());
+  Deoptimization::deoptimize_frame(thread, caller_frame.id(), Deoptimization::Reason_constraint);
 }