[Truffle] Make sure to check assumptions first in dispatch nodes (bef…

…ore the guard). * So to remove invalid specializations, and not fall in the unresolved case with a cache full of invalid nodes.
jruby · Dec 8, 2015 · b95ac47 · b95ac47
1 parent 30f9ea7
commit b95ac47
Showing 7 changed files with 67 additions and 90 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/dispatch/CachedBooleanDispatchNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/dispatch/CachedBooleanDispatchNode.java
@@ -73,6 +73,19 @@ public Object executeDispatch(
             Object methodName,
             DynamicObject blockObject,
             Object[] argumentsObjects) {
+        try {
+            trueUnmodifiedAssumption.check();
+            falseUnmodifiedAssumption.check();
+        } catch (InvalidAssumptionException e) {
+            return resetAndDispatch(
+                    frame,
+                    receiverObject,
+                    methodName,
+                    blockObject,
+                    argumentsObjects,
+                    "class modified");
+        }
+
         if (!guard(methodName, receiverObject)) {
             return next.executeDispatch(
                     frame,
@@ -85,18 +98,6 @@ public Object executeDispatch(
         if ((boolean) receiverObject) {
             trueProfile.enter();
 
-            try {
-                trueUnmodifiedAssumption.check();
-            } catch (InvalidAssumptionException e) {
-                return resetAndDispatch(
-                        frame,
-                        receiverObject,
-                        methodName,
-                        blockObject,
-                        argumentsObjects,
-                        "class modified");
-            }
-
             switch (getDispatchAction()) {
                 case CALL_METHOD:
                     return call(trueCallDirect, frame, trueMethod, receiverObject, blockObject, argumentsObjects);
@@ -109,18 +110,6 @@ public Object executeDispatch(
         } else {
             falseProfile.enter();
 
-            try {
-                falseUnmodifiedAssumption.check();
-            } catch (InvalidAssumptionException e) {
-                return resetAndDispatch(
-                        frame,
-                        receiverObject,
-                        methodName,
-                        blockObject,
-                        argumentsObjects,
-                        "class modified");
-            }
-
             switch (getDispatchAction()) {
                 case CALL_METHOD:
                     return call(falseCallDirect, frame, falseMethod, receiverObject, blockObject, argumentsObjects);

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/dispatch/CachedBoxedDispatchNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/dispatch/CachedBoxedDispatchNode.java
@@ -62,17 +62,6 @@ public Object executeDispatch(
             Object methodName,
             DynamicObject blockObject,
             Object[] argumentsObjects) {
-        if (!guard(methodName, receiverObject)) {
-            return next.executeDispatch(
-                    frame,
-                    receiverObject,
-                    methodName,
-                    blockObject,
-                    argumentsObjects);
-        }
-
-        // Check the class has not been modified
-
         try {
             validShape.check();
             unmodifiedAssumption.check();
@@ -86,6 +75,15 @@ public Object executeDispatch(
                     "class modified");
         }
 
+        if (!guard(methodName, receiverObject)) {
+            return next.executeDispatch(
+                    frame,
+                    receiverObject,
+                    methodName,
+                    blockObject,
+                    argumentsObjects);
+        }
+
         switch (getDispatchAction()) {
             case CALL_METHOD:
                 return call(callNode, frame, method, receiverObject, blockObject, argumentsObjects);

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/dispatch/CachedBoxedSymbolDispatchNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/dispatch/CachedBoxedSymbolDispatchNode.java
@@ -53,17 +53,6 @@ public Object executeDispatch(
             Object methodName,
             DynamicObject blockObject,
             Object[] argumentsObjects) {
-        if (!guard(methodName, receiverObject)) {
-            return next.executeDispatch(
-                    frame,
-                    receiverObject,
-                    methodName,
-                    blockObject,
-                    argumentsObjects);
-        }
-
-        // Check the class has not been modified
-
         try {
             unmodifiedAssumption.check();
         } catch (InvalidAssumptionException e) {
@@ -76,6 +65,15 @@ public Object executeDispatch(
                     "class modified");
         }
 
+        if (!guard(methodName, receiverObject)) {
+            return next.executeDispatch(
+                    frame,
+                    receiverObject,
+                    methodName,
+                    blockObject,
+                    argumentsObjects);
+        }
+
         switch (getDispatchAction()) {
             case CALL_METHOD:
                 return call(callNode, frame, method, receiverObject, blockObject, argumentsObjects);

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/dispatch/CachedMethodMissingDispatchNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/dispatch/CachedMethodMissingDispatchNode.java
@@ -78,17 +78,6 @@ public Object executeDispatch(
             Object methodName,
             DynamicObject blockObject,
             Object[] argumentsObjects) {
-        if (!guard(methodName, receiverObject)) {
-            return next.executeDispatch(
-                    frame,
-                    receiverObject,
-                    methodName,
-                    blockObject,
-                    argumentsObjects);
-        }
-
-        // Check the class has not been modified
-
         try {
             unmodifiedAssumption.check();
         } catch (InvalidAssumptionException e) {
@@ -101,6 +90,15 @@ public Object executeDispatch(
                     "class modified");
         }
 
+        if (!guard(methodName, receiverObject)) {
+            return next.executeDispatch(
+                    frame,
+                    receiverObject,
+                    methodName,
+                    blockObject,
+                    argumentsObjects);
+        }
+
         switch (getDispatchAction()) {
             case CALL_METHOD:
                 // When calling #method_missing we need to prepend the symbol

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/dispatch/CachedReturnMissingDispatchNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/dispatch/CachedReturnMissingDispatchNode.java
@@ -52,17 +52,6 @@ public Object executeDispatch(
             Object methodName,
             DynamicObject blockObject,
             Object[] argumentsObjects) {
-        if (!guard(methodName, receiverObject)) {
-            return next.executeDispatch(
-                    frame,
-                    receiverObject,
-                    methodName,
-                    blockObject,
-                    argumentsObjects);
-        }
-
-        // Check the class has not been modified
-
         try {
             unmodifiedAssumption.check();
         } catch (InvalidAssumptionException e) {
@@ -75,6 +64,15 @@ public Object executeDispatch(
                     "class modified");
         }
 
+        if (!guard(methodName, receiverObject)) {
+            return next.executeDispatch(
+                    frame,
+                    receiverObject,
+                    methodName,
+                    blockObject,
+                    argumentsObjects);
+        }
+
         switch (getDispatchAction()) {
             case CALL_METHOD:
                 return MISSING;

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/dispatch/CachedSingletonDispatchNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/dispatch/CachedSingletonDispatchNode.java
@@ -62,17 +62,6 @@ public Object executeDispatch(
             Object methodName,
             DynamicObject blockObject,
             Object[] argumentsObjects) {
-        if (!guard(methodName, receiverObject)) {
-            return next.executeDispatch(
-                    frame,
-                    receiverObject,
-                    methodName,
-                    blockObject,
-                    argumentsObjects);
-        }
-
-        // Check the class has not been modified
-
         try {
             unmodifiedAssumption.check();
         } catch (InvalidAssumptionException e) {
@@ -85,6 +74,15 @@ public Object executeDispatch(
                     "class modified");
         }
 
+        if (!guard(methodName, receiverObject)) {
+            return next.executeDispatch(
+                    frame,
+                    receiverObject,
+                    methodName,
+                    blockObject,
+                    argumentsObjects);
+        }
+
         switch (getDispatchAction()) {
             case CALL_METHOD:
                 return call(callNode, frame, method, expectedReceiver, blockObject, argumentsObjects);

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/dispatch/CachedUnboxedDispatchNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/dispatch/CachedUnboxedDispatchNode.java
@@ -57,17 +57,6 @@ public Object executeDispatch(
             Object methodName,
             DynamicObject blockObject,
             Object[] argumentsObjects) {
-        if (!guard(methodName, receiverObject)) {
-            return next.executeDispatch(
-                    frame,
-                    receiverObject,
-                    methodName,
-                    blockObject,
-                    argumentsObjects);
-        }
-
-        // Check the class has not been modified
-
         try {
             unmodifiedAssumption.check();
         } catch (InvalidAssumptionException e) {
@@ -80,6 +69,15 @@ public Object executeDispatch(
                     "class modified");
         }
 
+        if (!guard(methodName, receiverObject)) {
+            return next.executeDispatch(
+                    frame,
+                    receiverObject,
+                    methodName,
+                    blockObject,
+                    argumentsObjects);
+        }
+
         switch (getDispatchAction()) {
             case CALL_METHOD:
                 return call(callNode, frame, method, receiverObject, blockObject, argumentsObjects);