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: c6bc43ae75b4
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d0627d76b323
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 30, 2015

  1. [Truffle] initialize IO objects with @mode=0

    @woess
    woess committed Jun 30, 2015
    Copy the full SHA
    b2d6266 View commit details

  2. Merge branch 'truffle-head' into truffle-head

    @chrisseaton
    chrisseaton committed Jun 30, 2015
    Copy the full SHA
    d0627d7 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/IOPrimitiveNodes.java
4 changes: 2 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/nodes/rubinius/IOPrimitiveNodes.java
View file
Original file line number Diff line number Diff line change
@@ -107,7 +107,7 @@ public abstract class IOPrimitiveNodes {
public static class IOAllocator implements Allocator {
@Override
public RubyBasicObject allocate(RubyContext context, RubyClass rubyClass, Node currentNode) {
return new RubyBasicObject(rubyClass, IO_FACTORY.newInstance(context.getCoreLibrary().getNilObject(), 0, 0, context.getCoreLibrary().getNilObject()));
return new RubyBasicObject(rubyClass, IO_FACTORY.newInstance(context.getCoreLibrary().getNilObject(), 0, 0, 0));
}
}

@@ -149,7 +149,7 @@ public IOAllocatePrimitiveNode(RubyContext context, SourceSection sourceSection)
@Specialization
public RubyBasicObject allocate(VirtualFrame frame, RubyClass classToAllocate) {
final Object buffer = newBufferNode.call(frame, getContext().getCoreLibrary().getIOBufferClass(), "new", null);
return new RubyBasicObject(classToAllocate, IO_FACTORY.newInstance(buffer, 0, 0, nil()));
return new RubyBasicObject(classToAllocate, IO_FACTORY.newInstance(buffer, 0, 0, 0));
}

}