changeset 5140:5f79c8ebc5dc

Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Wed, 21 Mar 2012 14:39:11 +0100
parents ee615aee55b4 (current diff) def0b7331cca (diff)
children 8ee021ee75db
files
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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();
     }
 }