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

Commits on Nov 4, 2014

  1. [Truffle] Remove a couple of unused nodes.

    @chrisseaton
    chrisseaton committed Nov 4, 2014
    Copy the full SHA
    dbd0f97 View commit details

  2. [Truffle] Annotate some nodes that don't result in any machine code, … 

    …to better inform the inliner.
    @chrisseaton
    chrisseaton committed Nov 4, 2014
    3
    Copy the full SHA
    0e4c83c View commit details
1 change: 1 addition & 0 deletions core/src/main/java/org/jruby/truffle/nodes/control/ElidableResultNode.java
View file
Original file line number Diff line number Diff line change
@@ -23,6 +23,7 @@
* a non-void type is used. It is not executed at all if a void typed execute method is used.
* Therefore it should not perform any observable side effects.
*/
@NodeInfo(cost = NodeCost.NONE)
public class ElidableResultNode extends RubyNode {

@Child protected RubyNode required;
2 changes: 2 additions & 0 deletions core/src/main/java/org/jruby/truffle/nodes/control/PassthroughNode.java
View file
Original file line number Diff line number Diff line change
@@ -10,6 +10,8 @@
package org.jruby.truffle.nodes.control;

import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.nodes.NodeCost;
import com.oracle.truffle.api.nodes.NodeInfo;
import com.oracle.truffle.api.nodes.UnexpectedResultException;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.runtime.core.*;
1 change: 1 addition & 0 deletions core/src/main/java/org/jruby/truffle/nodes/control/SequenceNode.java
View file
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@
/**
* A sequence of statements to be executed in serial.
*/
@NodeInfo(cost = NodeCost.NONE)
public final class SequenceNode extends RubyNode {

@Children protected final RubyNode[] body;
3 changes: 3 additions & 0 deletions core/src/main/java/org/jruby/truffle/nodes/debug/RubyWrapper.java
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,8 @@
import com.oracle.truffle.api.instrument.SyntaxTag;
import com.oracle.truffle.api.instrument.Wrapper;
import com.oracle.truffle.api.nodes.Node;
import com.oracle.truffle.api.nodes.NodeCost;
import com.oracle.truffle.api.nodes.NodeInfo;
import com.oracle.truffle.api.nodes.UnexpectedResultException;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.nodes.RubyNode;
@@ -25,6 +27,7 @@

import java.math.BigInteger;

@NodeInfo(cost = NodeCost.NONE)
public class RubyWrapper extends ProxyNode implements Wrapper {

@Child protected Probe probe;
1 change: 1 addition & 0 deletions core/src/main/java/org/jruby/truffle/nodes/literal/BignumLiteralNode.java
View file
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@
import org.jruby.truffle.nodes.*;
import org.jruby.truffle.runtime.*;

@NodeInfo(cost = NodeCost.NONE)
public class BignumLiteralNode extends RubyNode {

private final BigInteger value;
1 change: 1 addition & 0 deletions core/src/main/java/org/jruby/truffle/nodes/literal/BooleanLiteralNode.java
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@
import org.jruby.truffle.nodes.*;
import org.jruby.truffle.runtime.*;

@NodeInfo(cost = NodeCost.NONE)
public class BooleanLiteralNode extends RubyNode {

private final boolean value;
4 changes: 4 additions & 0 deletions core/src/main/java/org/jruby/truffle/nodes/literal/FixnumLiteralNode.java
View file
Original file line number Diff line number Diff line change
@@ -10,12 +10,15 @@
package org.jruby.truffle.nodes.literal;

import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.nodes.NodeCost;
import com.oracle.truffle.api.nodes.NodeInfo;
import com.oracle.truffle.api.source.SourceSection;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.runtime.RubyContext;

public abstract class FixnumLiteralNode {

@NodeInfo(cost = NodeCost.NONE)
public static class IntegerFixnumLiteralNode extends RubyNode {

private final int value;
@@ -41,6 +44,7 @@ public int getValue() {

}

@NodeInfo(cost = NodeCost.NONE)
public static class LongFixnumLiteralNode extends RubyNode {

private final long value;
1 change: 1 addition & 0 deletions core/src/main/java/org/jruby/truffle/nodes/literal/FloatLiteralNode.java
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@
import org.jruby.truffle.nodes.*;
import org.jruby.truffle.runtime.*;

@NodeInfo(cost = NodeCost.NONE)
public class FloatLiteralNode extends RubyNode {

private final double value;
43 changes: 0 additions & 43 deletions core/src/main/java/org/jruby/truffle/nodes/literal/IntegerFixnumLiteralNode.java
View file

This file was deleted.

42 changes: 0 additions & 42 deletions core/src/main/java/org/jruby/truffle/nodes/literal/LongFixnumLiteralNode.java
View file

This file was deleted.

3 changes: 3 additions & 0 deletions core/src/main/java/org/jruby/truffle/nodes/literal/ObjectLiteralNode.java
View file
Original file line number Diff line number Diff line change
@@ -11,12 +11,15 @@

import java.math.*;

import com.oracle.truffle.api.nodes.NodeCost;
import com.oracle.truffle.api.nodes.NodeInfo;
import com.oracle.truffle.api.source.*;
import com.oracle.truffle.api.frame.*;
import org.jruby.truffle.nodes.*;
import org.jruby.truffle.runtime.*;
import org.jruby.truffle.runtime.core.*;

@NodeInfo(cost = NodeCost.NONE)
public class ObjectLiteralNode extends RubyNode {

private final Object object;
2 changes: 2 additions & 0 deletions core/src/main/java/org/jruby/truffle/nodes/methods/arguments/BehaveAsBlockNode.java
View file
Original file line number Diff line number Diff line change
@@ -11,12 +11,14 @@

import com.oracle.truffle.api.CompilerAsserts;
import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
import com.oracle.truffle.api.nodes.NodeCost;
import com.oracle.truffle.api.source.SourceSection;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.nodes.NodeInfo;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.runtime.RubyContext;

@NodeInfo(cost = NodeCost.NONE)
public class BehaveAsBlockNode extends RubyNode {

private @CompilationFinal boolean behaveAsBlock;