# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1365339198 -7200
# Node ID f69a72df49397eae82ee06c173e929451b0c6f06
# Parent  4877c7dfe6d68ac4ebc7f516245c5c7c36c549ad
Fix merge

diff -r 4877c7dfe6d6 -r f69a72df4939 src/share/vm/c1/c1_Runtime1.cpp
--- a/src/share/vm/c1/c1_Runtime1.cpp	Sun Apr 07 13:26:16 2013 +0200
+++ b/src/share/vm/c1/c1_Runtime1.cpp	Sun Apr 07 14:53:18 2013 +0200
@@ -1371,7 +1371,7 @@
   }
 
 
-  Deoptimization::deoptimize_frame(thread, caller_frame.id());
+  Deoptimization::deoptimize_frame(thread, caller_frame.id(), Deoptimization::Reason_none);
 
 JRT_END