# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1332337151 -3600
# Node ID 5f79c8ebc5dcfda33ea1a1fca37dbd603b279f37
# Parent  ee615aee55b4f32014dc3b2390df68e66acb1d6a# Parent  def0b7331cca30dc0f4b5dfdff3538931348d6c0
Merge.

diff -r ee615aee55b4 -r 5f79c8ebc5dc graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizeNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizeNode.java	Wed Mar 21 14:32:47 2012 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizeNode.java	Wed Mar 21 14:39:11 2012 +0100
@@ -68,8 +68,9 @@
         gen.emitDeoptimize(action, reason, message, leafGraphId);
     }
 
+    @SuppressWarnings("unused")
     @NodeIntrinsic
-    public static void deopt() {
+    public static void deopt(@ConstantNodeParameter RiDeoptAction action, @ConstantNodeParameter RiDeoptReason reason) {
         throw new UnsupportedOperationException();
     }
 }