[Truffle] Share the splitting strategy between cached dispatch nodes.

jruby · Sep 17, 2015 · 5a1d1fb · 5a1d1fb
1 parent c33cfd1
commit 5a1d1fb
Showing 6 changed files with 13 additions and 30 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
@@ -52,23 +52,15 @@ public CachedBooleanDispatchNode(
 
         if (falseMethod != null) {
             this.falseCallDirect = Truffle.getRuntime().createDirectCallNode(falseMethod.getCallTarget());
-
-            if (falseCallDirect.isCallTargetCloningAllowed() && falseMethod.getSharedMethodInfo().shouldAlwaysClone()) {
-                insert(falseCallDirect);
-                falseCallDirect.cloneCallTarget();
-            }
+            applySplittingStrategy(falseCallDirect, falseMethod);
         }
 
         this.trueUnmodifiedAssumption = trueUnmodifiedAssumption;
         this.trueMethod = trueMethod;
 
         if (trueMethod != null) {
             this.trueCallDirect = Truffle.getRuntime().createDirectCallNode(trueMethod.getCallTarget());
-
-            if (trueCallDirect.isCallTargetCloningAllowed() && trueMethod.getSharedMethodInfo().shouldAlwaysClone()) {
-                insert(trueCallDirect);
-                trueCallDirect.cloneCallTarget();
-            }
+            applySplittingStrategy(trueCallDirect, trueMethod);
         }
     }
 

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
@@ -44,11 +44,7 @@ public CachedBoxedDispatchNode(
         this.next = next;
         this.method = method;
         this.callNode = Truffle.getRuntime().createDirectCallNode(method.getCallTarget());
-
-        if (callNode.isCallTargetCloningAllowed() && method.getSharedMethodInfo().shouldAlwaysClone()) {
-            insert(callNode);
-            callNode.cloneCallTarget();
-        }
+        applySplittingStrategy(callNode, method);
     }
 
     @Override

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
@@ -39,11 +39,7 @@ public CachedBoxedSymbolDispatchNode(
         this.unmodifiedAssumption = Layouts.MODULE.getFields(context.getCoreLibrary().getSymbolClass()).getUnmodifiedAssumption();
         this.method = method;
         this.callNode = Truffle.getRuntime().createDirectCallNode(method.getCallTarget());
-
-        if (callNode.isCallTargetCloningAllowed() && method.getSharedMethodInfo().shouldAlwaysClone()) {
-            insert(callNode);
-            callNode.cloneCallTarget();
-        }
+        applySplittingStrategy(callNode, method);
     }
 
     @Override

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/dispatch/CachedDispatchNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/dispatch/CachedDispatchNode.java
@@ -80,6 +80,13 @@ protected DynamicObject getCachedNameAsSymbol() {
         return cachedNameAsSymbol;
     }
 
+    protected void applySplittingStrategy(DirectCallNode callNode, InternalMethod method) {
+        if (callNode.isCallTargetCloningAllowed() && method.getSharedMethodInfo().shouldAlwaysClone()) {
+            insert(callNode);
+            callNode.cloneCallTarget();
+        }
+    }
+
     protected static Object call(DirectCallNode callNode, VirtualFrame frame, InternalMethod method, Object receiver, DynamicObject block, Object[] arguments) {
         return callNode.call(
                 frame,

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
@@ -47,11 +47,7 @@ public CachedSingletonDispatchNode(
         this.next = next;
         this.method = method;
         this.callNode = Truffle.getRuntime().createDirectCallNode(method.getCallTarget());
-
-        if (callNode.isCallTargetCloningAllowed() && method.getSharedMethodInfo().shouldAlwaysClone()) {
-            insert(callNode);
-            callNode.cloneCallTarget();
-        }
+        applySplittingStrategy(callNode, method);
     }
 
     @Override

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
@@ -41,11 +41,7 @@ public CachedUnboxedDispatchNode(
         this.unmodifiedAssumption = unmodifiedAssumption;
         this.method = method;
         this.callNode = Truffle.getRuntime().createDirectCallNode(method.getCallTarget());
-
-        if (callNode.isCallTargetCloningAllowed() && method.getSharedMethodInfo().shouldAlwaysClone()) {
-            insert(callNode);
-            callNode.cloneCallTarget();
-        }
+        applySplittingStrategy(callNode, method);
     }
 
     @Override