[Truffle] Dup nodes on kwargs opt.

jruby · Mar 21, 2015 · 3422bcb · 3422bcb
1 parent 4728f23
commit 3422bcb
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/RubyCallNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/RubyCallNode.java
@@ -13,6 +13,7 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
+import com.oracle.truffle.api.nodes.NodeUtil;
 import com.oracle.truffle.api.source.SourceSection;
 import com.oracle.truffle.api.utilities.BranchProfile;
 import org.jruby.truffle.nodes.cast.BooleanCastNode;
@@ -129,7 +130,7 @@ public Object execute(VirtualFrame frame) {
                     keywordOptimizedArgumentsLength = optimized.length;
 
                     for (int n = 0; n < keywordOptimizedArgumentsLength; n++) {
-                        keywordOptimizedArguments[n] = insert(optimized[n]);
+                        keywordOptimizedArguments[n] = insert(NodeUtil.cloneNode(optimized[n]));
                     }
                 }
             }
@@ -291,7 +292,8 @@ public RubyNode[] expandedArgumentNodes(InternalMethod method, RubyNode[] argume
 
                 if (!keyIsSymbol) {
                     // cannot optimize case where keyword label is dynamic (not a fixed RubySymbol)
-                    return argumentNodes;
+                    cannotOptimize = true;
+                    return null;
                 }
 
                 final String label = ((ObjectLiteralNode) hashNode.getKey(j)).getObject().toString();