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

Commits on Mar 17, 2016

  1. [Truffle] Use RootNode.createConstantNode

    @chrisseaton
    chrisseaton committed Mar 17, 2016
    Copy the full SHA
    3c7eb18 View commit details

  2. [Truffle] Make generated ObjectTypes public because they're useful fo… 

    …r the interop DSL.
    @chrisseaton
    chrisseaton committed Mar 17, 2016
    1
    Copy the full SHA
    8a1879c View commit details
5 changes: 3 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/core/RubyMethodForeignAccessFactory.java
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@

import com.oracle.truffle.api.CallTarget;
import com.oracle.truffle.api.Truffle;
import com.oracle.truffle.api.nodes.RootNode;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.basicobject.BasicObjectForeignAccessFactory;
import org.jruby.truffle.interop.InteropExecute;
@@ -25,12 +26,12 @@ public RubyMethodForeignAccessFactory(RubyContext context) {

@Override
public CallTarget accessIsNull() {
return Truffle.getRuntime().createCallTarget(new RubyInteropRootNode(new BooleanLiteralNode(context, null, false)));
return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(false));
}

@Override
public CallTarget accessIsExecutable() {
return Truffle.getRuntime().createCallTarget(new RubyInteropRootNode(new BooleanLiteralNode(context, null, true)));
return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(true));
}

@Override
5 changes: 3 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/core/array/ArrayForeignAccessFactory.java
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@

import com.oracle.truffle.api.CallTarget;
import com.oracle.truffle.api.Truffle;
import com.oracle.truffle.api.nodes.RootNode;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.basicobject.BasicObjectForeignAccessFactory;
import org.jruby.truffle.interop.InteropGetSizeProperty;
@@ -25,12 +26,12 @@ public ArrayForeignAccessFactory(RubyContext context) {

@Override
public CallTarget accessIsNull() {
return Truffle.getRuntime().createCallTarget(new RubyInteropRootNode(new BooleanLiteralNode(context, null, false)));
return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(false));
}

@Override
public CallTarget accessHasSize() {
return Truffle.getRuntime().createCallTarget(new RubyInteropRootNode(new BooleanLiteralNode(context, null, true)));
return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(true));
}

@Override
7 changes: 4 additions & 3 deletions ...fle/src/main/java/org/jruby/truffle/core/basicobject/BasicObjectForeignAccessFactory.java
View file
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@
import com.oracle.truffle.api.Truffle;
import com.oracle.truffle.api.interop.ForeignAccess;
import com.oracle.truffle.api.interop.Message;
import com.oracle.truffle.api.nodes.RootNode;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.interop.InteropIsNull;
import org.jruby.truffle.interop.RubyInteropRootNode;
@@ -36,17 +37,17 @@ public CallTarget accessIsNull() {

@Override
public CallTarget accessIsExecutable() {
return Truffle.getRuntime().createCallTarget(new RubyInteropRootNode(new BooleanLiteralNode(context, null, false)));
return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(false));
}

@Override
public CallTarget accessIsBoxed() {
return Truffle.getRuntime().createCallTarget(new RubyInteropRootNode(new BooleanLiteralNode(context, null, false)));
return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(false));
}

@Override
public CallTarget accessHasSize() {
return Truffle.getRuntime().createCallTarget(new RubyInteropRootNode(new BooleanLiteralNode(context, null, false)));
return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(false));
}

@Override
5 changes: 3 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/core/hash/HashForeignAccessFactory.java
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@

import com.oracle.truffle.api.CallTarget;
import com.oracle.truffle.api.Truffle;
import com.oracle.truffle.api.nodes.RootNode;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.basicobject.BasicObjectForeignAccessFactory;
import org.jruby.truffle.interop.InteropGetSizeProperty;
@@ -25,12 +26,12 @@ public HashForeignAccessFactory(RubyContext context) {

@Override
public CallTarget accessIsNull() {
return Truffle.getRuntime().createCallTarget(new RubyInteropRootNode(new BooleanLiteralNode(context, null, false)));
return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(false));
}

@Override
public CallTarget accessHasSize() {
return Truffle.getRuntime().createCallTarget(new RubyInteropRootNode(new BooleanLiteralNode(context, null, true)));
return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(true));
}

@Override
5 changes: 3 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/core/string/StringForeignAccessFactory.java
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@

import com.oracle.truffle.api.CallTarget;
import com.oracle.truffle.api.Truffle;
import com.oracle.truffle.api.nodes.RootNode;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.basicobject.BasicObjectForeignAccessFactory;
import org.jruby.truffle.interop.InteropGetSizeProperty;
@@ -28,7 +29,7 @@ public StringForeignAccessFactory(RubyContext context) {

@Override
public CallTarget accessIsNull() {
return Truffle.getRuntime().createCallTarget(new RubyInteropRootNode(new BooleanLiteralNode(context, null, false)));
return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(false));
}

@Override
@@ -38,7 +39,7 @@ public CallTarget accessIsBoxed() {

@Override
public CallTarget accessHasSize() {
return Truffle.getRuntime().createCallTarget(new RubyInteropRootNode(new BooleanLiteralNode(context, null, true)));
return Truffle.getRuntime().createCallTarget(RootNode.createConstantNode(true));
}

@Override
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/om/dsl/processor/layout/LayoutGenerator.java
View file
Original file line number Diff line number Diff line change
@@ -64,7 +64,7 @@ public void generate(final PrintStream stream) {
typeSuperclass = layout.getSuperLayout().getName() + "LayoutImpl." + layout.getSuperLayout().getName() + "Type";
}

stream.printf(" protected static class %sType extends %s {%n", layout.getName(), typeSuperclass);
stream.printf(" public static class %sType extends %s {%n", layout.getName(), typeSuperclass);

if (layout.hasShapeProperties()) {
stream.println(" ");