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

Commits on Aug 3, 2016

  1. Copy the full SHA
    b248f72 View commit details
  2. Copy the full SHA
    93660dc View commit details
Showing with 59 additions and 62 deletions.
  1. +1 −1 truffle/src/main/java/org/jruby/truffle/core/array/ArrayDupNode.java
  2. +3 −3 truffle/src/main/java/org/jruby/truffle/core/array/ArrayNodes.java
  3. +1 −1 truffle/src/main/java/org/jruby/truffle/core/array/ArrayReadSliceNormalizedNode.java
  4. +1 −1 truffle/src/main/java/org/jruby/truffle/core/basicobject/BasicObjectNodes.java
  5. +1 −1 truffle/src/main/java/org/jruby/truffle/core/binding/BindingNodes.java
  6. +1 −1 truffle/src/main/java/org/jruby/truffle/core/dir/DirNodes.java
  7. +1 −1 truffle/src/main/java/org/jruby/truffle/core/exception/ExceptionNodes.java
  8. +1 −1 truffle/src/main/java/org/jruby/truffle/core/exception/NameErrorNodes.java
  9. +1 −1 truffle/src/main/java/org/jruby/truffle/core/exception/NoMethodErrorNodes.java
  10. +1 −1 truffle/src/main/java/org/jruby/truffle/core/exception/SystemCallErrorNodes.java
  11. +3 −3 truffle/src/main/java/org/jruby/truffle/core/hash/HashNodes.java
  12. +1 −1 truffle/src/main/java/org/jruby/truffle/core/mutex/ConditionVariableNodes.java
  13. +1 −1 truffle/src/main/java/org/jruby/truffle/core/mutex/MutexNodes.java
  14. +2 −2 truffle/src/main/java/org/jruby/truffle/core/proc/ProcNodes.java
  15. +1 −1 truffle/src/main/java/org/jruby/truffle/core/queue/QueueNodes.java
  16. +3 −3 truffle/src/main/java/org/jruby/truffle/core/range/RangeNodes.java
  17. +1 −1 truffle/src/main/java/org/jruby/truffle/core/regexp/RegexpNodes.java
  18. +1 −1 truffle/src/main/java/org/jruby/truffle/core/rubinius/AtomicReferenceNodes.java
  19. +1 −1 truffle/src/main/java/org/jruby/truffle/core/rubinius/IOBufferPrimitiveNodes.java
  20. +1 −1 truffle/src/main/java/org/jruby/truffle/core/rubinius/IOPrimitiveNodes.java
  21. +10 −10 truffle/src/main/java/org/jruby/truffle/core/string/StringNodes.java
  22. +1 −5 truffle/src/main/java/org/jruby/truffle/core/thread/ThreadNodes.java
  23. +9 −7 truffle/src/main/java/org/jruby/truffle/core/time/TimeNodes.java
  24. +1 −2 truffle/src/main/java/org/jruby/truffle/core/tracepoint/TracePointNodes.java
  25. +1 −1 truffle/src/main/java/org/jruby/truffle/extra/TrufflePosixNodes.java
  26. +5 −5 truffle/src/main/java/org/jruby/truffle/extra/ffi/PointerPrimitiveNodes.java
  27. +4 −4 truffle/src/main/java/org/jruby/truffle/language/objects/AllocateObjectNode.java
  28. +1 −1 truffle/src/main/java/org/jruby/truffle/stdlib/psych/PsychEmitterNodes.java
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ public abstract class ArrayDupNode extends RubyNode {

public ArrayDupNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
allocateNode = AllocateObjectNodeGen.create(context, sourceSection, null, null);
allocateNode = AllocateObjectNode.create();
}

public abstract DynamicObject executeDup(VirtualFrame frame, DynamicObject array);
Original file line number Diff line number Diff line change
@@ -107,7 +107,7 @@ public abstract static class AllocateNode extends CoreMethodArrayArgumentsNode {

public AllocateNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
allocateNode = AllocateObjectNodeGen.create(context, sourceSection, null, null);
allocateNode = AllocateObjectNode.create();
}

@Specialization
@@ -193,7 +193,7 @@ public abstract static class MulNode extends ArrayCoreMethodNode {

public MulNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
allocateObjectNode = AllocateObjectNodeGen.create(context, sourceSection, null, null);
allocateObjectNode = AllocateObjectNode.create();
}

protected abstract Object executeMul(VirtualFrame frame, DynamicObject array, int count);
@@ -275,7 +275,7 @@ public abstract static class IndexNode extends ArrayCoreMethodNode {

public IndexNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
allocateObjectNode = AllocateObjectNodeGen.create(context, sourceSection, null, null);
allocateObjectNode = AllocateObjectNode.create();
}

@Specialization
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ public abstract class ArrayReadSliceNormalizedNode extends RubyNode {

public ArrayReadSliceNormalizedNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
allocateObjectNode = AllocateObjectNodeGen.create(context, sourceSection, null, null);
allocateObjectNode = AllocateObjectNode.create();
}

public abstract DynamicObject executeReadSlice(DynamicObject array, int index, int length);
Original file line number Diff line number Diff line change
@@ -350,7 +350,7 @@ public abstract static class AllocateNode extends CoreMethodArrayArgumentsNode {

public AllocateNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
allocateObjectNode = AllocateObjectNodeGen.create(context, sourceSection, null, null);
allocateObjectNode = AllocateObjectNode.create();
}

@Specialization
Original file line number Diff line number Diff line change
@@ -109,7 +109,7 @@ public abstract static class DupNode extends UnaryCoreMethodNode {

public DupNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
allocateObjectNode = AllocateObjectNodeGen.create(context, sourceSection, null, null);
allocateObjectNode = AllocateObjectNode.create();
}

@Specialization
Original file line number Diff line number Diff line change
@@ -64,7 +64,7 @@ public static abstract class DirAllocatePrimitiveNode extends PrimitiveArrayArgu

public DirAllocatePrimitiveNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
allocateNode = AllocateObjectNodeGen.create(context, sourceSection, null, null);
allocateNode = AllocateObjectNode.create();
}

@Specialization
Original file line number Diff line number Diff line change
@@ -42,7 +42,7 @@ public abstract static class AllocateNode extends CoreMethodArrayArgumentsNode {

public AllocateNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
allocateObjectNode = AllocateObjectNodeGen.create(context, sourceSection, null, null);
allocateObjectNode = AllocateObjectNode.create();
}

@Specialization
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ public abstract static class AllocateNode extends CoreMethodArrayArgumentsNode {

public AllocateNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
allocateObjectNode = AllocateObjectNodeGen.create(context, sourceSection, null, null);
allocateObjectNode = AllocateObjectNode.create();
}

@Specialization
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ public abstract static class AllocateNode extends CoreMethodArrayArgumentsNode {

public AllocateNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
allocateObjectNode = AllocateObjectNodeGen.create(context, sourceSection, null, null);
allocateObjectNode = AllocateObjectNode.create();
}

@Specialization
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ public abstract static class AllocateNode extends CoreMethodArrayArgumentsNode {

public AllocateNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
allocateObjectNode = AllocateObjectNodeGen.create(context, sourceSection, null, null);
allocateObjectNode = AllocateObjectNode.create();
}

@Specialization
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ public abstract static class AllocateNode extends CoreMethodArrayArgumentsNode {

public AllocateNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
allocateObjectNode = AllocateObjectNodeGen.create(context, sourceSection, null, null);
allocateObjectNode = AllocateObjectNode.create();
}

@Specialization
@@ -81,7 +81,7 @@ public abstract static class ConstructNode extends CoreMethodArrayArgumentsNode
public ConstructNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
hashNode = new HashNode(context, sourceSection);
allocateObjectNode = AllocateObjectNodeGen.create(context, sourceSection, null, null);
allocateObjectNode = AllocateObjectNode.create();
}

@ExplodeLoop
@@ -882,7 +882,7 @@ public MergeNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
eqlNode = DispatchHeadNodeFactory.createMethodCall(context);
setNode = SetNodeGen.create(context, sourceSection, null, null, null, null);
allocateObjectNode = AllocateObjectNodeGen.create(context, sourceSection, null, null);
allocateObjectNode = AllocateObjectNode.create();
}

// Merge with an empty hash, without a block
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@ public abstract static class AllocateNode extends CoreMethodArrayArgumentsNode {

public AllocateNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
allocateNode = AllocateObjectNodeGen.create(context, sourceSection, null, null);
allocateNode = AllocateObjectNode.create();
}

@Specialization
Original file line number Diff line number Diff line change
@@ -42,7 +42,7 @@ public abstract static class AllocateNode extends CoreMethodArrayArgumentsNode {

public AllocateNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
allocateNode = AllocateObjectNodeGen.create(context, sourceSection, null, null);
allocateNode = AllocateObjectNode.create();
}

@Specialization
Original file line number Diff line number Diff line change
@@ -123,7 +123,7 @@ protected DynamicObject metaClass(DynamicObject object) {
private AllocateObjectNode getAllocateObjectNode() {
if (allocateObjectNode == null) {
CompilerDirectives.transferToInterpreterAndInvalidate();
allocateObjectNode = insert(AllocateObjectNodeGen.create(getContext(), null, null, null));
allocateObjectNode = insert(AllocateObjectNode.create());
}

return allocateObjectNode;
@@ -165,7 +165,7 @@ public DynamicObject dup(DynamicObject proc) {
private AllocateObjectNode getAllocateObjectNode() {
if (allocateObjectNode == null) {
CompilerDirectives.transferToInterpreterAndInvalidate();
allocateObjectNode = insert(AllocateObjectNodeGen.create(getContext(), null, null, null));
allocateObjectNode = insert(AllocateObjectNode.create());
}

return allocateObjectNode;
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@ public abstract static class AllocateNode extends CoreMethodArrayArgumentsNode {

public AllocateNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
allocateNode = AllocateObjectNodeGen.create(context, sourceSection, null, null);
allocateNode = AllocateObjectNode.create();
}

@Specialization
Original file line number Diff line number Diff line change
@@ -219,7 +219,7 @@ public abstract static class DupNode extends UnaryCoreMethodNode {

public DupNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
allocateObjectNode = AllocateObjectNodeGen.create(context, sourceSection, null, null);
allocateObjectNode = AllocateObjectNode.create();
}

@Specialization(guards = "isIntRange(range)")
@@ -565,7 +565,7 @@ public Object objectRange(
}
if (allocateNode == null) {
CompilerDirectives.transferToInterpreterAndInvalidate();
allocateNode = insert(AllocateObjectNodeGen.create(getContext(), getSourceSection(), null, null));
allocateNode = insert(AllocateObjectNode.create());
}

final Object cmpResult;
@@ -599,7 +599,7 @@ public abstract static class AllocateNode extends UnaryCoreMethodNode {

public AllocateNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
allocateNode = AllocateObjectNodeGen.create(context, sourceSection, null, null);
allocateNode = AllocateObjectNode.create();
}

@Specialization
Original file line number Diff line number Diff line change
@@ -608,7 +608,7 @@ public abstract static class AllocateNode extends CoreMethodArrayArgumentsNode {

public AllocateNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
allocateNode = AllocateObjectNodeGen.create(context, sourceSection, null, null);
allocateNode = AllocateObjectNode.create();
}

@Specialization
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ public abstract static class AllocateNode extends CoreMethodArrayArgumentsNode {

public AllocateNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
allocateNode = AllocateObjectNodeGen.create(context, sourceSection, null, null);
allocateNode = AllocateObjectNode.create();
}

@Specialization
Original file line number Diff line number Diff line change
@@ -70,7 +70,7 @@ public static abstract class IOBufferAllocatePrimitiveNode extends PrimitiveArra

public IOBufferAllocatePrimitiveNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
allocateNode = AllocateObjectNodeGen.create(context, sourceSection, null, null);
allocateNode = AllocateObjectNode.create();
}

@Specialization
Original file line number Diff line number Diff line change
@@ -119,7 +119,7 @@ public static abstract class IOAllocatePrimitiveNode extends IOPrimitiveArrayArg

public IOAllocatePrimitiveNode(RubyContext context, SourceSection sourceSection) {
newBufferNode = DispatchHeadNodeFactory.createMethodCall(context);
allocateNode = AllocateObjectNodeGen.create(context, sourceSection, null, null);
allocateNode = AllocateObjectNode.create();
}

@Specialization
Original file line number Diff line number Diff line change
@@ -166,7 +166,7 @@ public abstract static class AllocateNode extends CoreMethodArrayArgumentsNode {

public AllocateNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
allocateObjectNode = AllocateObjectNodeGen.create(context, sourceSection, null, null);
allocateObjectNode = AllocateObjectNode.create();
}

@Specialization
@@ -253,7 +253,7 @@ public abstract static class MulNode extends CoreMethodArrayArgumentsNode {

public MulNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
allocateObjectNode = AllocateObjectNodeGen.create(context, sourceSection, null, null);
allocateObjectNode = AllocateObjectNode.create();
}

public abstract DynamicObject executeInt(VirtualFrame frame, DynamicObject string, int times);
@@ -477,7 +477,7 @@ public abstract static class GetIndexNode extends CoreMethodArrayArgumentsNode {

public GetIndexNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
allocateObjectNode = AllocateObjectNodeGen.create(context, sourceSection, null, null);
allocateObjectNode = AllocateObjectNode.create();
}

@Specialization(guards = "wasNotProvided(length) || isRubiniusUndefined(length)")
@@ -1057,7 +1057,7 @@ public abstract static class EachCharNode extends YieldingCoreMethodNode {

public EachCharNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
allocateObjectNode = AllocateObjectNodeGen.create(context, sourceSection, null, null);
allocateObjectNode = AllocateObjectNode.create();
makeSubstringNode = RopeNodesFactory.MakeSubstringNodeGen.create(null, null, null);
}

@@ -1702,7 +1702,7 @@ public abstract static class DumpNode extends CoreMethodArrayArgumentsNode {

public DumpNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
allocateObjectNode = AllocateObjectNodeGen.create(context, sourceSection, null, null);
allocateObjectNode = AllocateObjectNode.create();
}

@Specialization(guards = "isAsciiCompatible(string)")
@@ -2758,7 +2758,7 @@ public static StringByteSubstringPrimitiveNode create(RubyContext context, Sourc

public StringByteSubstringPrimitiveNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
allocateObjectNode = AllocateObjectNodeGen.create(context, sourceSection, null, null);
allocateObjectNode = AllocateObjectNode.create();
makeSubstringNode = RopeNodesFactory.MakeSubstringNodeGen.create(null, null, null);
taintResultNode = new TaintResultNode(context, sourceSection);
}
@@ -3126,7 +3126,7 @@ public static abstract class StringFindCharacterNode extends PrimitiveArrayArgum

public StringFindCharacterNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
allocateObjectNode = AllocateObjectNodeGen.create(context, sourceSection, null, null);
allocateObjectNode = AllocateObjectNode.create();
makeSubstringNode = RopeNodesFactory.MakeSubstringNodeGen.create(null, null, null);
}

@@ -3857,7 +3857,7 @@ public static abstract class StringPatternPrimitiveNode extends PrimitiveArrayAr

public StringPatternPrimitiveNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
allocateObjectNode = AllocateObjectNodeGen.create(context, sourceSection, null, null);
allocateObjectNode = AllocateObjectNode.create();
makeLeafRopeNode = RopeNodes.MakeLeafRopeNode.create();
makeRepeatingNode = RopeNodes.MakeRepeatingNode.create();
}
@@ -4289,7 +4289,7 @@ private DynamicObject makeRope(DynamicObject string, Rope rope, int beg, int len

if (allocateNode == null) {
CompilerDirectives.transferToInterpreterAndInvalidate();
allocateNode = insert(AllocateObjectNodeGen.create(getContext(), getSourceSection(), null, null));
allocateNode = insert(AllocateObjectNode.create());
}

if (makeSubstringNode == null) {
@@ -4318,7 +4318,7 @@ private DynamicObject makeBuffer(DynamicObject string, int beg, int len) {

if (allocateNode == null) {
CompilerDirectives.transferToInterpreterAndInvalidate();
allocateNode = insert(AllocateObjectNodeGen.create(getContext(), getSourceSection(), null, null));
allocateNode = insert(AllocateObjectNode.create());
}

if (taintResultNode == null) {
Original file line number Diff line number Diff line change
@@ -410,7 +410,7 @@ public abstract static class AllocateNode extends CoreMethodArrayArgumentsNode {
@Specialization
public DynamicObject allocate(
DynamicObject rubyClass,
@Cached("createAllocateObjectNode()") AllocateObjectNode allocateObjectNode,
@Cached("create()") AllocateObjectNode allocateObjectNode,
@Cached("createReadAbortOnExceptionNode()") ReadObjectFieldNode readAbortOnException ) {
final DynamicObject object = allocateObjectNode.allocate(
rubyClass,
@@ -432,10 +432,6 @@ public DynamicObject allocate(
return object;
}

protected AllocateObjectNode createAllocateObjectNode() {
return AllocateObjectNodeGen.create(null, null);
}

protected ReadObjectFieldNode createReadAbortOnExceptionNode() {
return ReadObjectFieldNodeGen.create("@abort_on_exception", false);
}
Loading