Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9ecd3ddbd01c
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3422bcb1e5b6
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Mar 20, 2015

  1. [Truffle] Missing node insert.

    @chrisseaton
    chrisseaton committed Mar 20, 2015
    Copy the full SHA
    4728f23 View commit details

Commits on Mar 21, 2015

  1. [Truffle] Dup nodes on kwargs opt.

    @chrisseaton
    chrisseaton committed Mar 21, 2015
    Copy the full SHA
    3422bcb View commit details
Showing with 4 additions and 2 deletions.
  1. +4 −2 truffle/src/main/java/org/jruby/truffle/nodes/RubyCallNode.java
6 changes: 4 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/nodes/RubyCallNode.java
View file
Original file line number Diff line number Diff line change
@@ -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] = 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();