# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1358347199 -3600
# Node ID 4fc2763e670e3ac2dedb213773e1eaf8e31f3952
# Parent  69318374c8d789c1a4f7a3eb8689b70367ce64b4
Another merge fix.

diff -r 69318374c8d7 -r 4fc2763e670e src/share/vm/opto/runtime.cpp
--- 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);
 }