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

Commits on Apr 5, 2016

  1. Copy the full SHA
    15851fe View commit details

Commits on Apr 6, 2016

  1. Copy the full SHA
    a1f37ba View commit details
  2. Copy the full SHA
    a1ad7b8 View commit details
  3. Copy the full SHA
    10fa887 View commit details
  4. Copy the full SHA
    246cae8 View commit details
  5. [Truffle] Queue is safe.

    chrisseaton committed Apr 6, 2016
    Copy the full SHA
    89fbfe3 View commit details
  6. Copy the full SHA
    5ccaa9e View commit details
  7. Copy the full SHA
    1084cd0 View commit details
  8. Copy the full SHA
    79aeb56 View commit details
Original file line number Diff line number Diff line change
@@ -381,7 +381,7 @@ public DynamicObject current() {

}

@CoreMethod(unsafeNeedsAudit = true, names = "allocate", constructor = true, unsafe = UnsafeGroup.THREADS)
@CoreMethod(names = "allocate", constructor = true, unsafe = UnsafeGroup.THREADS)
public abstract static class AllocateNode extends CoreMethodArrayArgumentsNode {

public AllocateNode(RubyContext context, SourceSection sourceSection) {
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@
@CoreClass(name = "Method")
public abstract class MethodNodes {

@CoreMethod(unsafeNeedsAudit = true, names = { "==", "eql?" }, required = 1)
@CoreMethod(names = { "==", "eql?" }, required = 1)
public abstract static class EqualNode extends CoreMethodArrayArgumentsNode {

@Child protected ReferenceEqualNode referenceEqualNode;
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@
@CoreClass(name = "ObjectSpace")
public abstract class ObjectSpaceNodes {

@CoreMethod(unsafeNeedsAudit = true, names = "_id2ref", isModuleFunction = true, required = 1)
@CoreMethod(names = "_id2ref", isModuleFunction = true, required = 1)
@ImportStatic(ObjectIDOperations.class)
public abstract static class ID2RefNode extends CoreMethodArrayArgumentsNode {

@@ -103,7 +103,7 @@ protected boolean isFloatID(DynamicObject id) {

}

@CoreMethod(unsafeNeedsAudit = true, names = "each_object", isModuleFunction = true, needsBlock = true, optional = 1, returnsEnumeratorIfNoBlock = true)
@CoreMethod(names = "each_object", isModuleFunction = true, needsBlock = true, optional = 1, returnsEnumeratorIfNoBlock = true)
public abstract static class EachObjectNode extends YieldingCoreMethodNode {

public EachObjectNode(RubyContext context, SourceSection sourceSection) {
@@ -149,7 +149,7 @@ private boolean isHidden(DynamicObject object) {

}

@CoreMethod(unsafeNeedsAudit = true, names = "define_finalizer", isModuleFunction = true, required = 2)
@CoreMethod(names = "define_finalizer", isModuleFunction = true, required = 2)
public abstract static class DefineFinalizerNode extends CoreMethodArrayArgumentsNode {

// MRI would do a dynamic call to #respond_to? but it seems better to warn the user earlier.
@@ -175,7 +175,7 @@ public DynamicObject defineFinalizer(VirtualFrame frame, DynamicObject object, O

}

@CoreMethod(unsafeNeedsAudit = true, names = "undefine_finalizer", isModuleFunction = true, required = 1)
@CoreMethod(names = "undefine_finalizer", isModuleFunction = true, required = 1)
public abstract static class UndefineFinalizerNode extends CoreMethodArrayArgumentsNode {

public UndefineFinalizerNode(RubyContext context, SourceSection sourceSection) {
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@
@CoreClass(name = "Queue")
public abstract class QueueNodes {

@CoreMethod(unsafeNeedsAudit = true, names = "allocate", constructor = true)
@CoreMethod(names = "allocate", constructor = true)
public abstract static class AllocateNode extends CoreMethodArrayArgumentsNode {

@Child private AllocateObjectNode allocateNode;
@@ -56,7 +56,7 @@ public DynamicObject allocate(DynamicObject rubyClass) {

}

@CoreMethod(unsafeNeedsAudit = true, names = { "push", "<<", "enq" }, required = 1)
@CoreMethod(names = { "push", "<<", "enq" }, required = 1)
public abstract static class PushNode extends CoreMethodArrayArgumentsNode {

public PushNode(RubyContext context, SourceSection sourceSection) {
@@ -79,7 +79,7 @@ private void doPush(final Object value, final BlockingQueue<Object> queue) {

}

@CoreMethod(unsafeNeedsAudit = true, names = { "pop", "shift", "deq" }, optional = 1)
@CoreMethod(names = { "pop", "shift", "deq" }, optional = 1)
@NodeChildren({
@NodeChild(type = RubyNode.class, value = "queue"),
@NodeChild(type = RubyNode.class, value = "nonBlocking")
@@ -133,7 +133,7 @@ private Object doPoll(final BlockingQueue<Object> queue) {
}

@RubiniusOnly
@CoreMethod(unsafeNeedsAudit = true, names = "receive_timeout", required = 1, visibility = Visibility.PRIVATE)
@CoreMethod(names = "receive_timeout", required = 1, visibility = Visibility.PRIVATE)
@NodeChildren({
@NodeChild(type = RubyNode.class, value = "queue"),
@NodeChild(type = RubyNode.class, value = "duration")
@@ -183,7 +183,7 @@ public Object block() throws InterruptedException {

}

@CoreMethod(unsafeNeedsAudit = true, names = "empty?")
@CoreMethod(names = "empty?")
public abstract static class EmptyNode extends CoreMethodArrayArgumentsNode {

public EmptyNode(RubyContext context, SourceSection sourceSection) {
@@ -199,7 +199,7 @@ public boolean empty(DynamicObject self) {

}

@CoreMethod(unsafeNeedsAudit = true, names = { "size", "length" })
@CoreMethod(names = { "size", "length" })
public abstract static class SizeNode extends CoreMethodArrayArgumentsNode {

public SizeNode(RubyContext context, SourceSection sourceSection) {
@@ -215,7 +215,7 @@ public int size(DynamicObject self) {

}

@CoreMethod(unsafeNeedsAudit = true, names = "clear")
@CoreMethod(names = "clear")
public abstract static class ClearNode extends CoreMethodArrayArgumentsNode {

public ClearNode(RubyContext context, SourceSection sourceSection) {
@@ -232,7 +232,7 @@ public DynamicObject clear(DynamicObject self) {

}

@CoreMethod(unsafeNeedsAudit = true, names = "marshal_dump")
@CoreMethod(names = "marshal_dump")
public abstract static class MarshalDumpNode extends CoreMethodArrayArgumentsNode {

public MarshalDumpNode(RubyContext context, SourceSection sourceSection) {
@@ -247,7 +247,7 @@ public Object marshal_dump(DynamicObject self) {

}

@CoreMethod(unsafeNeedsAudit = true, names = "num_waiting")
@CoreMethod(names = "num_waiting")
public abstract static class NumWaitingNode extends CoreMethodArrayArgumentsNode {

public NumWaitingNode(RubyContext context, SourceSection sourceSection) {
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@
@CoreClass(name = "SizedQueue")
public abstract class SizedQueueNodes {

@CoreMethod(unsafeNeedsAudit = true, names = "allocate", constructor = true)
@CoreMethod(names = "allocate", constructor = true)
public abstract static class AllocateNode extends CoreMethodArrayArgumentsNode {

public AllocateNode(RubyContext context, SourceSection sourceSection) {
@@ -53,7 +53,7 @@ public DynamicObject allocate(DynamicObject rubyClass) {

}

@CoreMethod(unsafeNeedsAudit = true, names = "initialize", visibility = Visibility.PRIVATE, required = 1)
@CoreMethod(names = "initialize", visibility = Visibility.PRIVATE, required = 1)
public abstract static class InitializeNode extends CoreMethodArrayArgumentsNode {

public InitializeNode(RubyContext context, SourceSection sourceSection) {
@@ -74,7 +74,7 @@ public DynamicObject initialize(DynamicObject self, int capacity) {

}

@CoreMethod(unsafeNeedsAudit = true, names = "max=", required = 1)
@CoreMethod(names = "max=", required = 1)
public abstract static class SetMaxNode extends CoreMethodArrayArgumentsNode {

public SetMaxNode(RubyContext context, SourceSection sourceSection) {
@@ -104,7 +104,7 @@ public int setMax(DynamicObject self, int newCapacity) {

}

@CoreMethod(unsafeNeedsAudit = true, names = "max")
@CoreMethod(names = "max")
public abstract static class MaxNode extends CoreMethodArrayArgumentsNode {

public MaxNode(RubyContext context, SourceSection sourceSection) {
@@ -122,7 +122,7 @@ public int max(DynamicObject self) {

}

@CoreMethod(unsafeNeedsAudit = true, names = { "push", "<<", "enq" }, required = 1, optional = 1)
@CoreMethod(names = { "push", "<<", "enq" }, required = 1, optional = 1)
@NodeChildren({
@NodeChild(type = RubyNode.class, value = "queue"),
@NodeChild(type = RubyNode.class, value = "value"),
@@ -179,7 +179,7 @@ private boolean doOffer(final Object value, final BlockingQueue<Object> queue) {

}

@CoreMethod(unsafeNeedsAudit = true, names = { "pop", "shift", "deq" }, optional = 1)
@CoreMethod(names = { "pop", "shift", "deq" }, optional = 1)
@NodeChildren({
@NodeChild(type = RubyNode.class, value = "queue"),
@NodeChild(type = RubyNode.class, value = "nonBlocking")
@@ -232,7 +232,7 @@ private Object doPoll(final BlockingQueue<Object> queue) {

}

@CoreMethod(unsafeNeedsAudit = true, names = "empty?")
@CoreMethod(names = "empty?")
public abstract static class EmptyNode extends CoreMethodArrayArgumentsNode {

public EmptyNode(RubyContext context, SourceSection sourceSection) {
@@ -248,7 +248,7 @@ public boolean empty(DynamicObject self) {

}

@CoreMethod(unsafeNeedsAudit = true, names = { "size", "length" })
@CoreMethod(names = { "size", "length" })
public abstract static class SizeNode extends CoreMethodArrayArgumentsNode {

public SizeNode(RubyContext context, SourceSection sourceSection) {
@@ -263,7 +263,7 @@ public int size(DynamicObject self) {

}

@CoreMethod(unsafeNeedsAudit = true, names = "clear")
@CoreMethod(names = "clear")
public abstract static class ClearNode extends CoreMethodArrayArgumentsNode {

public ClearNode(RubyContext context, SourceSection sourceSection) {
@@ -280,7 +280,7 @@ public DynamicObject clear(DynamicObject self) {

}

@CoreMethod(unsafeNeedsAudit = true, names = "num_waiting")
@CoreMethod(names = "num_waiting")
public abstract static class NumWaitingNode extends CoreMethodArrayArgumentsNode {

public NumWaitingNode(RubyContext context, SourceSection sourceSection) {
Loading