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

Commits on Jan 3, 2015

  1. [Truffle] Remove method receiver object from dispatch.

    @chrisseaton
    chrisseaton committed Jan 3, 2015
    Copy the full SHA
    8aef251 View commit details

  2. [Truffle] Include all primitive types in our type system.

    @chrisseaton
    chrisseaton committed Jan 3, 2015
    Copy the full SHA
    0ba6430 View commit details
1 change: 0 additions & 1 deletion core/src/main/java/org/jruby/truffle/nodes/ReadConstantNode.java
View file
Original file line number Diff line number Diff line change
@@ -45,7 +45,6 @@ public Object execute(VirtualFrame frame) {

return dispatch.dispatch(
frame,
getContext().getCoreLibrary().getNilObject(),
lexicalScope,
receiverObject,
name,
4 changes: 4 additions & 0 deletions core/src/main/java/org/jruby/truffle/nodes/RubyTypes.java
View file
Original file line number Diff line number Diff line change
@@ -28,8 +28,12 @@
LexicalScope.class, //
UndefinedPlaceholder.class, //
boolean.class, //
byte.class, //
int.class, //
char.class, //
short.class, //
long.class, //
float.class, //
double.class, //
String.class, // for SymbolCastNode
RubyBignum.class, //
2 changes: 0 additions & 2 deletions core/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java
View file
Original file line number Diff line number Diff line change
@@ -621,7 +621,6 @@ public Object getConstant(VirtualFrame frame, RubyModule module, RubyString name

return dispatch.dispatch(
frame,
getContext().getCoreLibrary().getNilObject(),
null,
module,
name,
@@ -636,7 +635,6 @@ public Object getConstant(VirtualFrame frame, RubyModule module, RubySymbol name

return dispatch.dispatch(
frame,
getContext().getCoreLibrary().getNilObject(),
null,
module,
name,
5 changes: 0 additions & 5 deletions core/src/main/java/org/jruby/truffle/nodes/dispatch/CachedBooleanDispatchNode.java
View file
Original file line number Diff line number Diff line change
@@ -103,7 +103,6 @@ public CachedBooleanDispatchNode(CachedBooleanDispatchNode prev) {
@Specialization(guards = "guardName")
public Object dispatch(
VirtualFrame frame,
RubyNilClass methodReceiverObject,
LexicalScope lexicalScope,
boolean receiverObject,
Object methodName,
@@ -120,7 +119,6 @@ public Object dispatch(
} catch (InvalidAssumptionException e) {
return resetAndDispatch(
frame,
methodReceiverObject,
lexicalScope,
receiverObject,
methodName,
@@ -166,7 +164,6 @@ public Object dispatch(
} catch (InvalidAssumptionException e) {
return resetAndDispatch(
frame,
methodReceiverObject,
lexicalScope,
receiverObject,
methodName,
@@ -210,7 +207,6 @@ public Object dispatch(
@Fallback
public Object dispatch(
VirtualFrame frame,
Object methodReceiverObject,
LexicalScope lexicalScope,
Object receiverObject,
Object methodName,
@@ -219,7 +215,6 @@ public Object dispatch(
Dispatch.DispatchAction dispatchAction) {
return next.executeDispatch(
frame,
methodReceiverObject,
lexicalScope,
receiverObject,
methodName,
5 changes: 0 additions & 5 deletions core/src/main/java/org/jruby/truffle/nodes/dispatch/CachedBoxedDispatchNode.java
View file
Original file line number Diff line number Diff line change
@@ -87,7 +87,6 @@ public CachedBoxedDispatchNode(CachedBoxedDispatchNode prev) {
@Specialization(guards = "guardName")
public Object dispatch(
VirtualFrame frame,
RubyNilClass methodReceiverObject,
LexicalScope lexicalScope,
RubyBasicObject receiverObject,
Object methodName,
@@ -101,7 +100,6 @@ public Object dispatch(
if (receiverObject.getMetaClass() != expectedClass) {
return next.executeDispatch(
frame,
methodReceiverObject,
lexicalScope,
receiverObject,
methodName,
@@ -117,7 +115,6 @@ public Object dispatch(
} catch (InvalidAssumptionException e) {
return resetAndDispatch(
frame,
methodReceiverObject,
lexicalScope,
receiverObject,
methodName,
@@ -160,7 +157,6 @@ public Object dispatch(
@Fallback
public Object dispatch(
VirtualFrame frame,
Object methodReceiverObject,
LexicalScope lexicalScope,
Object receiverObject,
Object methodName,
@@ -169,7 +165,6 @@ public Object dispatch(
Dispatch.DispatchAction dispatchAction) {
return next.executeDispatch(
frame,
methodReceiverObject,
lexicalScope,
receiverObject,
methodName,
5 changes: 0 additions & 5 deletions .../src/main/java/org/jruby/truffle/nodes/dispatch/CachedBoxedMethodMissingDispatchNode.java
View file
Original file line number Diff line number Diff line change
@@ -82,7 +82,6 @@ public CachedBoxedMethodMissingDispatchNode(CachedBoxedMethodMissingDispatchNode
@Specialization(guards = "guardName")
public Object dispatch(
VirtualFrame frame,
RubyNilClass methodReceiverObject,
LexicalScope lexicalScope,
RubyBasicObject receiverObject,
Object methodName,
@@ -96,7 +95,6 @@ public Object dispatch(
if (receiverObject.getMetaClass() != expectedClass) {
return next.executeDispatch(
frame,
methodReceiverObject,
lexicalScope,
receiverObject,
methodName,
@@ -112,7 +110,6 @@ public Object dispatch(
} catch (InvalidAssumptionException e) {
return resetAndDispatch(
frame,
methodReceiverObject,
lexicalScope,
receiverObject,
methodName,
@@ -182,7 +179,6 @@ public Object dispatch(
@Fallback
public Object dispatch(
VirtualFrame frame,
Object methodReceiverObject,
LexicalScope lexicalScope,
Object receiverObject,
Object methodName,
@@ -191,7 +187,6 @@ public Object dispatch(
Dispatch.DispatchAction dispatchAction) {
return next.executeDispatch(
frame,
methodReceiverObject,
lexicalScope,
receiverObject,
methodName,
5 changes: 0 additions & 5 deletions .../src/main/java/org/jruby/truffle/nodes/dispatch/CachedBoxedReturnMissingDispatchNode.java
View file
Original file line number Diff line number Diff line change
@@ -46,7 +46,6 @@ public CachedBoxedReturnMissingDispatchNode(CachedBoxedReturnMissingDispatchNode
@Specialization(guards = "guardName")
public Object dispatch(
VirtualFrame frame,
RubyNilClass methodReceiverObject,
LexicalScope lexicalScope,
RubyBasicObject receiverObject,
Object methodName,
@@ -60,7 +59,6 @@ public Object dispatch(
if (receiverObject.getMetaClass() != expectedClass) {
return next.executeDispatch(
frame,
methodReceiverObject,
lexicalScope,
receiverObject,
methodName,
@@ -76,7 +74,6 @@ public Object dispatch(
} catch (InvalidAssumptionException e) {
return resetAndDispatch(
frame,
methodReceiverObject,
lexicalScope,
receiverObject,
methodName,
@@ -98,7 +95,6 @@ public Object dispatch(
@Fallback
public Object dispatch(
VirtualFrame frame,
Object methodReceiverObject,
LexicalScope lexicalScope,
Object receiverObject,
Object methodName,
@@ -107,7 +103,6 @@ public Object dispatch(
Dispatch.DispatchAction dispatchAction) {
return next.executeDispatch(
frame,
methodReceiverObject,
lexicalScope,
receiverObject,
methodName,
4 changes: 0 additions & 4 deletions core/src/main/java/org/jruby/truffle/nodes/dispatch/CachedBoxedSymbolDispatchNode.java
View file
Original file line number Diff line number Diff line change
@@ -70,7 +70,6 @@ public CachedBoxedSymbolDispatchNode(CachedBoxedSymbolDispatchNode prev) {
@Specialization(guards = "guardName")
public Object dispatch(
VirtualFrame frame,
RubyNilClass methodReceiverObject,
LexicalScope lexicalScope,
RubySymbol receiverObject,
Object methodName,
@@ -86,7 +85,6 @@ public Object dispatch(
} catch (InvalidAssumptionException e) {
return resetAndDispatch(
frame,
methodReceiverObject,
lexicalScope,
receiverObject,
methodName,
@@ -129,7 +127,6 @@ public Object dispatch(
@Fallback
public Object dispatch(
VirtualFrame frame,
Object methodReceiverObject,
LexicalScope lexicalScope,
Object receiverObject,
Object methodName,
@@ -138,7 +135,6 @@ public Object dispatch(
Dispatch.DispatchAction dispatchAction) {
return next.executeDispatch(
frame,
methodReceiverObject,
lexicalScope,
receiverObject,
methodName,
1 change: 0 additions & 1 deletion core/src/main/java/org/jruby/truffle/nodes/dispatch/CachedDispatchNode.java
View file
Original file line number Diff line number Diff line change
@@ -58,7 +58,6 @@ public CachedDispatchNode(CachedDispatchNode prev) {
}

protected final boolean guardName(
Object methodReceiverObject,
LexicalScope lexicalScope,
Object receiverObject,
Object methodName,
8 changes: 1 addition & 7 deletions core/src/main/java/org/jruby/truffle/nodes/dispatch/CachedUnboxedDispatchNode.java
View file
Original file line number Diff line number Diff line change
@@ -69,7 +69,6 @@ public CachedUnboxedDispatchNode(CachedUnboxedDispatchNode prev) {
@Specialization(guards = {"isPrimitive", "guardName"})
public Object dispatch(
VirtualFrame frame,
RubyNilClass methodReceiverObject,
LexicalScope lexicalScope,
Object receiverObject,
Object methodName,
@@ -83,7 +82,6 @@ public Object dispatch(
if (receiverObject.getClass() != expectedClass) {
return next.executeDispatch(
frame,
methodReceiverObject,
lexicalScope,
receiverObject,
methodName,
@@ -99,7 +97,6 @@ public Object dispatch(
} catch (InvalidAssumptionException e) {
return resetAndDispatch(
frame,
methodReceiverObject,
lexicalScope,
receiverObject,
methodName,
@@ -138,9 +135,8 @@ public Object dispatch(
}

@Fallback
public Object dispatch(
public Object dispatchFallback(
VirtualFrame frame,
Object methodReceiverObject,
LexicalScope lexicalScope,
Object receiverObject,
Object methodName,
@@ -149,7 +145,6 @@ public Object dispatch(
Dispatch.DispatchAction dispatchAction) {
return next.executeDispatch(
frame,
methodReceiverObject,
lexicalScope,
receiverObject,
methodName,
@@ -159,7 +154,6 @@ public Object dispatch(
}

protected static final boolean isPrimitive(
Object methodReceiverObject,
LexicalScope lexicalScope,
Object receiverObject,
Object methodName,
7 changes: 1 addition & 6 deletions core/src/main/java/org/jruby/truffle/nodes/dispatch/DispatchHeadNode.java
View file
Original file line number Diff line number Diff line change
@@ -63,7 +63,6 @@ public Object call(
Object... argumentsObjects) {
return dispatch(
frame,
context.getCoreLibrary().getNilObject(),
null, // TODO(eregon): was RubyArguments.getSelf(frame.getArguments()),
receiverObject,
methodName,
@@ -148,7 +147,6 @@ public boolean doesRespondTo(
Object receiverObject) {
return (boolean) dispatch(
frame,
context.getCoreLibrary().getNilObject(),
null, // TODO(eregon): was RubyArguments.getSelf(frame.getArguments()),
receiverObject,
methodName,
@@ -159,7 +157,6 @@ public boolean doesRespondTo(

public Object dispatch(
VirtualFrame frame,
Object methodReceiverObject,
LexicalScope lexicalScope,
Object receiverObject,
Object methodName,
@@ -169,7 +166,6 @@ public Object dispatch(
if (rubiniusPrimitive) {
return first.executeDispatch(
frame,
methodReceiverObject,
lexicalScope,
RubyArguments.getSelf(frame.getArguments()),
methodName,
@@ -179,7 +175,6 @@ public Object dispatch(
} else {
return first.executeDispatch(
frame,
methodReceiverObject,
lexicalScope,
receiverObject,
methodName,
@@ -199,7 +194,7 @@ public DispatchNode getFirstDispatchNode() {

public void forceUncached() {
adoptChildren();
first.replace(UncachedDispatchNodeFactory.create(context, ignoreVisibility, null, null, null, null, null, null, null));
first.replace(UncachedDispatchNodeFactory.create(context, ignoreVisibility, null, null, null, null, null, null));
}

}
6 changes: 0 additions & 6 deletions core/src/main/java/org/jruby/truffle/nodes/dispatch/DispatchNode.java
View file
Original file line number Diff line number Diff line change
@@ -26,7 +26,6 @@
import org.jruby.truffle.runtime.LexicalScope;

@NodeChildren({
@NodeChild(value="methodReceiverObject", type=Node.class),
@NodeChild(value="lexicalScope", type=Node.class),
@NodeChild(value="receiver", type=Node.class),
@NodeChild(value="methodName", type=Node.class),
@@ -45,7 +44,6 @@ public DispatchNode(DispatchNode prev) {

public abstract Object executeDispatch(
VirtualFrame frame,
Object methodReceiverObject,
LexicalScope lexicalScope,
Object receiverObject,
Object methodName,
@@ -112,7 +110,6 @@ protected RubyMethod lookup(

protected Object resetAndDispatch(
VirtualFrame frame,
Object methodReceiverObject,
LexicalScope lexicalScope,
Object receiverObject,
Object methodName,
@@ -124,7 +121,6 @@ protected Object resetAndDispatch(
head.reset(reason);
return head.dispatch(
frame,
methodReceiverObject,
lexicalScope,
receiverObject,
methodName,
@@ -143,7 +139,6 @@ public final Object execute(VirtualFrame frame) {

protected boolean actionIsReadConstant(
VirtualFrame frame,
Object methodReceiverObject,
LexicalScope lexicalScope,
Object receiverObject,
Object methodName,
@@ -155,7 +150,6 @@ protected boolean actionIsReadConstant(

protected boolean actionIsCallOrRespondToMethod(
VirtualFrame frame,
Object methodReceiverObject,
LexicalScope lexicalScope,
Object receiverObject,
Object methodName,
Loading