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

Commits on Mar 7, 2016

  1. [Truffle] Remove methods related to the old instrumentation API.

    @chrisseaton
    chrisseaton committed Mar 7, 2016
    Copy the full SHA
    06bfc5f View commit details

  2. [Truffle] BaseLibC is dead code.

    @chrisseaton
    chrisseaton committed Mar 7, 2016
    Copy the full SHA
    dc63d6b View commit details

  3. [Truffle] Remove deprecated POSIX methods.

    @chrisseaton
    chrisseaton committed Mar 7, 2016
    Copy the full SHA
    d5cbc53 View commit details

  4. [Truffle] Use new reportLoopCount

    @chrisseaton
    chrisseaton committed Mar 7, 2016
    Copy the full SHA
    359e4c1 View commit details
15 changes: 0 additions & 15 deletions truffle/src/main/java/org/jruby/truffle/RubyLanguage.java
View file
Original file line number Diff line number Diff line change
@@ -82,21 +82,6 @@ protected boolean isObjectOfLanguage(Object object) {
throw new UnsupportedOperationException();
}

@Override
protected Visualizer getVisualizer() {
throw new UnsupportedOperationException();
}

@Override
public boolean isInstrumentable(Node node) {
throw new UnsupportedOperationException();
}

@Override
protected WrapperNode createWrapperNode(Node node) {
throw new UnsupportedOperationException();
}

@Override
protected Object evalInContext(Source source, Node node, MaterializedFrame mFrame) throws IOException {
return null;
43 changes: 22 additions & 21 deletions truffle/src/main/java/org/jruby/truffle/core/array/ArrayNodes.java
View file
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@
import com.oracle.truffle.api.nodes.DirectCallNode;
import com.oracle.truffle.api.nodes.ExplodeLoop;
import com.oracle.truffle.api.nodes.IndirectCallNode;
import com.oracle.truffle.api.nodes.LoopNode;
import com.oracle.truffle.api.nodes.UnexpectedResultException;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.profiles.BranchProfile;
@@ -1092,7 +1093,7 @@ public Object eachIntegerFixnum(VirtualFrame frame, DynamicObject array, Dynamic
}
} finally {
if (CompilerDirectives.inInterpreter()) {
getRootNode().reportLoopCount(count);
LoopNode.reportLoopCount(this, count);
}
}

@@ -1115,7 +1116,7 @@ public Object eachLongFixnum(VirtualFrame frame, DynamicObject array, DynamicObj
}
} finally {
if (CompilerDirectives.inInterpreter()) {
getRootNode().reportLoopCount(count);
LoopNode.reportLoopCount(this, count);
}
}

@@ -1138,7 +1139,7 @@ public Object eachFloat(VirtualFrame frame, DynamicObject array, DynamicObject b
}
} finally {
if (CompilerDirectives.inInterpreter()) {
getRootNode().reportLoopCount(count);
LoopNode.reportLoopCount(this, count);
}
}

@@ -1161,7 +1162,7 @@ public Object eachObject(VirtualFrame frame, DynamicObject array, DynamicObject
}
} finally {
if (CompilerDirectives.inInterpreter()) {
getRootNode().reportLoopCount(count);
LoopNode.reportLoopCount(this, count);
}
}

@@ -1199,7 +1200,7 @@ public Object eachWithIndexInt(VirtualFrame frame, DynamicObject array, DynamicO
}
} finally {
if (CompilerDirectives.inInterpreter()) {
getRootNode().reportLoopCount(count);
LoopNode.reportLoopCount(this, count);
}
}

@@ -1222,7 +1223,7 @@ public Object eachWithIndexLong(VirtualFrame frame, DynamicObject array, Dynamic
}
} finally {
if (CompilerDirectives.inInterpreter()) {
getRootNode().reportLoopCount(count);
LoopNode.reportLoopCount(this, count);
}
}

@@ -1245,7 +1246,7 @@ public Object eachWithIndexDouble(VirtualFrame frame, DynamicObject array, Dynam
}
} finally {
if (CompilerDirectives.inInterpreter()) {
getRootNode().reportLoopCount(count);
LoopNode.reportLoopCount(this, count);
}
}

@@ -1268,7 +1269,7 @@ public Object eachWithIndexObject(VirtualFrame frame, DynamicObject array, Dynam
}
} finally {
if (CompilerDirectives.inInterpreter()) {
getRootNode().reportLoopCount(count);
LoopNode.reportLoopCount(this, count);
}
}

@@ -1586,7 +1587,7 @@ public Object initializeBlock(VirtualFrame frame, DynamicObject array, int size,
}
} finally {
if (CompilerDirectives.inInterpreter()) {
getRootNode().reportLoopCount(count);
LoopNode.reportLoopCount(this, count);
}

setStoreAndSize(array, arrayBuilder.finish(store, n), n);
@@ -1830,7 +1831,7 @@ private Object injectHelper(VirtualFrame frame, ArrayMirror mirror, DynamicObjec
}
} finally {
if (CompilerDirectives.inInterpreter()) {
getRootNode().reportLoopCount(count);
LoopNode.reportLoopCount(this, count);
}
}

@@ -1853,7 +1854,7 @@ private Object injectSymbolHelper(VirtualFrame frame, ArrayMirror mirror, Dynami
}
} finally {
if (CompilerDirectives.inInterpreter()) {
getRootNode().reportLoopCount(count);
LoopNode.reportLoopCount(this, count);
}
}

@@ -1991,7 +1992,7 @@ public Object mapIntegerFixnum(VirtualFrame frame, DynamicObject array, DynamicO
}
} finally {
if (CompilerDirectives.inInterpreter()) {
getRootNode().reportLoopCount(count);
LoopNode.reportLoopCount(this, count);
}
}

@@ -2016,7 +2017,7 @@ public Object mapLongFixnum(VirtualFrame frame, DynamicObject array, DynamicObje
}
} finally {
if (CompilerDirectives.inInterpreter()) {
getRootNode().reportLoopCount(count);
LoopNode.reportLoopCount(this, count);
}
}

@@ -2041,7 +2042,7 @@ public Object mapFloat(VirtualFrame frame, DynamicObject array, DynamicObject bl
}
} finally {
if (CompilerDirectives.inInterpreter()) {
getRootNode().reportLoopCount(count);
LoopNode.reportLoopCount(this, count);
}
}

@@ -2066,7 +2067,7 @@ public Object mapObject(VirtualFrame frame, DynamicObject array, DynamicObject b
}
} finally {
if (CompilerDirectives.inInterpreter()) {
getRootNode().reportLoopCount(count);
LoopNode.reportLoopCount(this, count);
}
}

@@ -2105,7 +2106,7 @@ public Object mapInPlaceFixnumInteger(VirtualFrame frame, DynamicObject array, D
}
} finally {
if (CompilerDirectives.inInterpreter()) {
getRootNode().reportLoopCount(count);
LoopNode.reportLoopCount(this, count);
}
}

@@ -2129,7 +2130,7 @@ public Object mapInPlaceObject(VirtualFrame frame, DynamicObject array, DynamicO
}
} finally {
if (CompilerDirectives.inInterpreter()) {
getRootNode().reportLoopCount(count);
LoopNode.reportLoopCount(this, count);
}
}

@@ -3174,7 +3175,7 @@ public Object selectObject(VirtualFrame frame, DynamicObject array, DynamicObjec
}
} finally {
if (CompilerDirectives.inInterpreter()) {
getRootNode().reportLoopCount(count);
LoopNode.reportLoopCount(this, count);
}
}

@@ -3208,7 +3209,7 @@ public Object selectFixnumInteger(VirtualFrame frame, DynamicObject array, Dynam
}
} finally {
if (CompilerDirectives.inInterpreter()) {
getRootNode().reportLoopCount(count);
LoopNode.reportLoopCount(this, count);
}
}

@@ -3552,7 +3553,7 @@ public Object selectObject(VirtualFrame frame, DynamicObject array, DynamicObjec
}
} finally {
if (CompilerDirectives.inInterpreter()) {
getRootNode().reportLoopCount(count);
LoopNode.reportLoopCount(this, count);
}
}

@@ -3584,7 +3585,7 @@ public Object selectFixnumInteger(VirtualFrame frame, DynamicObject array, Dynam
}
} finally {
if (CompilerDirectives.inInterpreter()) {
getRootNode().reportLoopCount(count);
LoopNode.reportLoopCount(this, count);
}
}

3 changes: 2 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/core/format/nodes/control/NNode.java
View file
Original file line number Diff line number Diff line change
@@ -12,6 +12,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.LoopNode;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.format.nodes.PackNode;

@@ -50,7 +51,7 @@ public Object execute(VirtualFrame frame) {
}

if (CompilerDirectives.inInterpreter()) {
getRootNode().reportLoopCount(repeats);
LoopNode.reportLoopCount(this, repeats);
}

return null;
3 changes: 2 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/core/format/nodes/control/SequenceNode.java
View file
Original file line number Diff line number Diff line change
@@ -12,6 +12,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.LoopNode;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.format.nodes.PackNode;

@@ -37,7 +38,7 @@ public Object execute(VirtualFrame frame) {
}

if (CompilerDirectives.inInterpreter()) {
getRootNode().reportLoopCount(children.length);
LoopNode.reportLoopCount(this, children.length);
}

return null;
3 changes: 2 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/core/format/nodes/control/StarNode.java
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.nodes.LoopNode;
import org.jruby.truffle.RubyContext;
import org.jruby.truffle.core.format.nodes.PackNode;

@@ -41,7 +42,7 @@ public Object execute(VirtualFrame frame) {
}

if (CompilerDirectives.inInterpreter()) {
getRootNode().reportLoopCount(loops);
LoopNode.reportLoopCount(this, loops);
}

return null;
7 changes: 4 additions & 3 deletions truffle/src/main/java/org/jruby/truffle/core/hash/HashNodes.java
View file
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.nodes.ExplodeLoop;
import com.oracle.truffle.api.nodes.LoopNode;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.profiles.BranchProfile;
import com.oracle.truffle.api.profiles.ConditionProfile;
@@ -579,7 +580,7 @@ public DynamicObject eachPackedArray(VirtualFrame frame, DynamicObject hash, Dyn
}
} finally {
if (CompilerDirectives.inInterpreter()) {
getRootNode().reportLoopCount(count);
LoopNode.reportLoopCount(this, count);
}
}

@@ -800,7 +801,7 @@ public DynamicObject mapPackedArray(VirtualFrame frame, DynamicObject hash, Dyna
}
} finally {
if (CompilerDirectives.inInterpreter()) {
getRootNode().reportLoopCount(length);
LoopNode.reportLoopCount(this, length);
}
}

@@ -824,7 +825,7 @@ public DynamicObject mapBuckets(VirtualFrame frame, DynamicObject hash, DynamicO
}
} finally {
if (CompilerDirectives.inInterpreter()) {
getRootNode().reportLoopCount(length);
LoopNode.reportLoopCount(this, length);
}
}

13 changes: 7 additions & 6 deletions truffle/src/main/java/org/jruby/truffle/core/numeric/IntegerNodes.java
View file
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@
import com.oracle.truffle.api.dsl.Cached;
import com.oracle.truffle.api.dsl.Specialization;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.nodes.LoopNode;
import com.oracle.truffle.api.object.DynamicObject;
import com.oracle.truffle.api.profiles.LoopConditionProfile;
import com.oracle.truffle.api.source.SourceSection;
@@ -55,7 +56,7 @@ public Object downto(VirtualFrame frame, int from, int to, DynamicObject block)
}
} finally {
if (CompilerDirectives.inInterpreter()) {
getRootNode().reportLoopCount(count);
LoopNode.reportLoopCount(this, count);
}
}

@@ -82,7 +83,7 @@ public Object downto(VirtualFrame frame, long from, long to, DynamicObject block
}
} finally {
if (CompilerDirectives.inInterpreter()) {
getRootNode().reportLoopCount(count);
LoopNode.reportLoopCount(this, count);
}
}

@@ -138,7 +139,7 @@ public int times(VirtualFrame frame, int n, DynamicObject block,
}
} finally {
if (CompilerDirectives.inInterpreter()) {
getRootNode().reportLoopCount(i);
LoopNode.reportLoopCount(this, i);
}
}

@@ -156,7 +157,7 @@ public long times(VirtualFrame frame, long n, DynamicObject block,
}
} finally {
if (CompilerDirectives.inInterpreter()) {
getRootNode().reportLoopCount(i < Integer.MAX_VALUE ? (int) i : Integer.MAX_VALUE);
LoopNode.reportLoopCount(this, i < Integer.MAX_VALUE ? (int) i : Integer.MAX_VALUE);
}
}

@@ -223,7 +224,7 @@ public Object upto(VirtualFrame frame, int from, int to, DynamicObject block) {
}
} finally {
if (CompilerDirectives.inInterpreter()) {
getRootNode().reportLoopCount(count);
LoopNode.reportLoopCount(this, count);
}
}

@@ -249,7 +250,7 @@ public Object upto(VirtualFrame frame, long from, long to, DynamicObject block)
}
} finally {
if (CompilerDirectives.inInterpreter()) {
getRootNode().reportLoopCount(count);
LoopNode.reportLoopCount(this, count);
}
}

Loading