[Truffle] Fix depth detection in unresolved dispatch.

We used to detect the depth of a dispatch chain by counting the number of parents between the node and the DispatchHeadNode. That no longer works now we are using the DSL for dispatch nodes, as they form their own chain. This was causing megamorphic dispatch to be created either too early or not at all, as the correct depth was either hit too early or jumped over entirely. This patch maintains depth manually.
jruby · Oct 30, 2014 · af2cd60 · af2cd60
1 parent 894e802
commit af2cd60
Showing 1 changed file with 5 additions and 15 deletions.
diff --git a/core/src/main/java/org/jruby/truffle/nodes/dispatch/UnresolvedDispatchNode.java b/core/src/main/java/org/jruby/truffle/nodes/dispatch/UnresolvedDispatchNode.java
@@ -24,6 +24,8 @@
 
 public final class UnresolvedDispatchNode extends DispatchNode {
 
+    private int depth = 0;
+
     private final boolean ignoreVisibility;
     private final Dispatch.MissingBehavior missingBehavior;
 
@@ -46,14 +48,16 @@ public Object executeDispatch(
             Dispatch.DispatchAction dispatchAction) {
         CompilerDirectives.transferToInterpreterAndInvalidate();
 
-        if (getDepth() == Options.TRUFFLE_DISPATCH_POLYMORPHIC_MAX.load()) {
+        if (depth == Options.TRUFFLE_DISPATCH_POLYMORPHIC_MAX.load()) {
             return getHeadNode().getFirstDispatchNode()
                     .replace(UncachedDispatchNodeFactory.create(getContext(), ignoreVisibility,
                             null, null, null, null, null, null, null))
                     .executeDispatch(frame, methodReceiverObject, lexicalScope, receiverObject,
                             methodName, blockObject, argumentsObjects, dispatchAction);
         }
 
+        depth++;
+
         final DispatchNode first = getHeadNode().getFirstDispatchNode();
 
         if (receiverObject instanceof RubyBasicObject) {
@@ -276,18 +280,4 @@ private DispatchNode createMethodMissingNode(
         }
     }
 
-    private int getDepth() {
-        final DispatchHeadNode head = getHeadNode();
-        Node parent = getParent();
-
-        int depth = 1;
-
-        while (parent != head) {
-            depth++;
-            parent = parent.getParent();
-        }
-
-        return depth;
-    }
-
 }