diff graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/AssumptionsTest.java @ 16756:5148aab962af

Truffle-DSL: updated tests for the new generation layout.
author Christian Humer <christian.humer@gmail.com>
date Mon, 11 Aug 2014 15:53:05 +0200
parents 79041ab43660
children 9f38d222fa6c
line wrap: on
line diff
--- a/graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/AssumptionsTest.java	Mon Aug 11 15:53:05 2014 +0200
+++ b/graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/AssumptionsTest.java	Mon Aug 11 15:53:05 2014 +0200
@@ -48,15 +48,16 @@
     @NodeAssumptions("assumption")
     abstract static class SingleAssumptionNode extends ValueNode {
 
-        @Specialization(order = 0, assumptions = "assumption")
-        int doInt() {
+        @Specialization(assumptions = "assumption")
+        int do2() {
             return 42;
         }
 
-        @Specialization
-        Object doObject() {
+        @Generic
+        Object doFallBack() {
             return "42";
         }
+
     }
 
     @Test
@@ -67,9 +68,9 @@
 
         Assert.assertEquals(42, TestHelper.executeWith(root));
         assumption2.invalidate();
-        Assert.assertEquals("42", TestHelper.executeWith(root));
+        Assert.assertEquals("41", TestHelper.executeWith(root));
         assumption1.invalidate();
-        Assert.assertEquals("43", TestHelper.executeWith(root));
+        Assert.assertEquals("42", TestHelper.executeWith(root));
     }
 
     @NodeAssumptions({"assumption1", "assumption2"})
@@ -82,12 +83,12 @@
 
         @Specialization(assumptions = "assumption1")
         Object doObject() {
-            return "42";
+            return "41";
         }
 
         @Generic
-        Object doGeneric() {
-            return "43";
+        Object doFallBack() {
+            return "42";
         }
     }
 
@@ -107,10 +108,11 @@
     @NodeAssumptions({"additionalAssumption"})
     abstract static class DerivedAssumptionNode extends SingleAssumptionNode {
 
-        @Specialization(order = 1, assumptions = "additionalAssumption")
+        @Specialization(assumptions = "additionalAssumption")
         int doIntDerived() {
             return 43;
         }
+
     }
 
     @Test
@@ -129,7 +131,7 @@
     @NodeAssumptions({"additionalAssumption", "assumption"})
     abstract static class DerivedAssumptionRedeclaredNode extends SingleAssumptionNode {
 
-        @Specialization(order = 1, assumptions = "additionalAssumption")
+        @Specialization(assumptions = "additionalAssumption")
         int doIntDerived() {
             return 43;
         }