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: 773a24f74e8d
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e2386bcf7e3b
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 21, 2016

  1. Copy the full SHA
    db83dbc View commit details
  2. [Truffle] Dead code.

    chrisseaton committed Jun 21, 2016
    Copy the full SHA
    e2386bc View commit details
Original file line number Diff line number Diff line change
@@ -62,9 +62,4 @@ public DispatchAction getDispatchAction() {
return dispatchAction;
}

public void forceUncached() {
adoptChildren();
first.replace(new UncachedDispatchNode(context, ignoreVisibility, dispatchAction, missingBehavior));
}

}
Original file line number Diff line number Diff line change
@@ -67,6 +67,7 @@ public RubyCallNode(RubyContext context, SourceSection section, String methodNam
this.methodName = methodName;
this.receiver = receiver;
this.arguments = arguments;

if (block == null) {
this.block = null;
} else {
@@ -76,8 +77,6 @@ public RubyCallNode(RubyContext context, SourceSection section, String methodNam
this.isSplatted = isSplatted;
this.isVCall = isVCall;
this.ignoreVisibility = ignoreVisibility;

this.dispatchHead = DispatchHeadNodeFactory.createMethodCall(context, ignoreVisibility);
}

@Override
@@ -86,6 +85,11 @@ public Object execute(VirtualFrame frame) {
final Object[] argumentsObjects = executeArguments(frame);
final DynamicObject blockObject = executeBlock(frame);

if (dispatchHead == null) {
CompilerDirectives.transferToInterpreterAndInvalidate();
dispatchHead = insert(DispatchHeadNodeFactory.createMethodCall(getContext(), ignoreVisibility));
}

return dispatchHead.call(frame, receiverObject, methodName, blockObject, argumentsObjects);
}