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

Commits on Jul 30, 2015

  1. [Truffle] Do not put JRuby+Truffle classes on the bootclasspath. 

    * Otherwise just -ea does not work anymore (but -esa or -ea:org.jruby.truffle... would)
    @eregon
    eregon committed Jul 30, 2015
    Copy the full SHA
    cc2e537 View commit details

  2. [Truffle] Fix the usage of ArrayBuilderNode in Array#initialize. 

    * The size is known beforehand.
    @eregon
    eregon committed Jul 30, 2015
    Copy the full SHA
    0a2ca8a View commit details
Showing with 6 additions and 4 deletions.
  1. +5 −2 tool/jruby_eclipse
  2. +1 −2 truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayNodes.java
7 changes: 5 additions & 2 deletions tool/jruby_eclipse
View file
Original file line number Diff line number Diff line change
@@ -24,17 +24,20 @@ ARGV.each { |arg|
}

bootclasspath = []
classpath = []

bootclasspath << "#{JRUBY}/lib/jruby.jar"
bootclasspath << "#{JRUBY}/lib/jruby-stdlib-9.0.0.0-SNAPSHOT.jar"
if rest.include?('-X+T')
bootclasspath << TRUFFLEJAR
bootclasspath << "#{JRUBY}/truffle/build.eclipse"
bootclasspath << "#{JRUBY}/truffle/src/main/ruby"
classpath << "#{JRUBY}/truffle/build.eclipse"
classpath << "#{JRUBY}/truffle/src/main/ruby"
end

args = [java]
args << "-Djffi.boot.library.path=#{JRUBY}/lib/jni"
args << "-Xbootclasspath/a:" + bootclasspath.join(':')
args << "-cp" << classpath.join(':') unless classpath.empty?

args << "-Djruby.home=#{JRUBY}"
args << "-Djruby.lib=#{JRUBY}/lib"
3 changes: 1 addition & 2 deletions truffle/src/main/java/org/jruby/truffle/nodes/core/array/ArrayNodes.java
View file
Original file line number Diff line number Diff line change
@@ -1918,7 +1918,7 @@ public Object initializeNegative(VirtualFrame frame, RubyBasicObject array, int

@Specialization(guards = {"size >= 0", "isRubyProc(block)"})
public Object initialize(VirtualFrame frame, RubyBasicObject array, int size, NotProvided defaultValue, RubyBasicObject block) {
Object store = arrayBuilder.start();
Object store = arrayBuilder.start(size);

int count = 0;
int n = 0;
@@ -1928,7 +1928,6 @@ public Object initialize(VirtualFrame frame, RubyBasicObject array, int size, No
count++;
}

arrayBuilder.ensure(store, n + 1);
store = arrayBuilder.appendValue(store, n, yield(frame, block, n));
}
} finally {