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

Commits on Sep 9, 2016

  1. Copy the full SHA
    326b76d View commit details
  2. Copy the full SHA
    cd4ed81 View commit details
Showing with 7 additions and 31 deletions.
  1. +1 −1 tool/jt.rb
  2. +1 −4 truffle/pom.rb
  3. +1 −7 truffle/pom.xml
  4. +3 −12 truffle/src/main/java/org/jruby/truffle/JRubyTruffleImpl.java
  5. +1 −7 truffle/src/main/java/org/jruby/truffle/interop/InteropNodes.java
2 changes: 1 addition & 1 deletion tool/jt.rb
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
require 'yaml'
require 'open3'

GRAALVM_VERSION = '0.15'
GRAALVM_VERSION = '0.16'

JRUBY_DIR = File.expand_path('../..', __FILE__)
M2_REPO = File.expand_path('~/.m2/repository')
5 changes: 1 addition & 4 deletions truffle/pom.rb
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@

properties( 'polyglot.dump.pom' => 'pom.xml',
'polyglot.dump.readonly' => true,
'truffle.version' => '387cbe478688e84d211aa534b7b93d47709cadd9-SNAPSHOT',
'truffle.version' => '0.17',
'jruby.basedir' => '${basedir}/..',
'maven.test.skip' => 'true' )

@@ -18,9 +18,6 @@

jar 'org.jruby:jruby-core', '${project.version}', :scope => 'provided'

repository( :url => 'http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots/',
:id => 'truffle' )

truffle_version = '${truffle.version}'
jar 'com.oracle.truffle:truffle-api:' + truffle_version
jar 'com.oracle.truffle:truffle-debug:' + truffle_version
8 changes: 1 addition & 7 deletions truffle/pom.xml
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ DO NOT MODIFIY - GENERATED CODE
<jruby.basedir>${basedir}/..</jruby.basedir>
<polyglot.dump.readonly>true</polyglot.dump.readonly>
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
<truffle.version>387cbe478688e84d211aa534b7b93d47709cadd9-SNAPSHOT</truffle.version>
<truffle.version>0.17</truffle.version>
</properties>
<dependencies>
<dependency>
@@ -68,12 +68,6 @@ DO NOT MODIFIY - GENERATED CODE
<scope>test</scope>
</dependency>
</dependencies>
<repositories>
<repository>
<id>truffle</id>
<url>http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots/</url>
</repository>
</repositories>
<build>
<defaultGoal>package</defaultGoal>
<resources>
15 changes: 3 additions & 12 deletions truffle/src/main/java/org/jruby/truffle/JRubyTruffleImpl.java
Original file line number Diff line number Diff line change
@@ -32,11 +32,7 @@ public JRubyTruffleImpl(Ruby runtime) {
engine = PolyglotEngine.newBuilder()
.globalSymbol(JRubyTruffleInterface.RUNTIME_SYMBOL, new JRubyContextWrapper(runtime))
.build();
try {
context = (RubyContext) engine.eval(loadSource("Truffle::Boot.context", "context")).get();
} catch (IOException e) {
throw new JavaException(e);
}
context = (RubyContext) engine.eval(loadSource("Truffle::Boot.context", "context")).get();
}

@Override
@@ -51,13 +47,8 @@ public Object execute(org.jruby.ast.RootNode rootNode) {

try {
return engine.eval(loadSource("Truffle::Boot.run_jruby_root", "run_jruby_root")).get();
} catch (IOException e) {
if (e.getCause() instanceof ExitException) {
final ExitException exit = (ExitException) e.getCause();
throw new org.jruby.exceptions.MainExitException(exit.getCode());
}

throw new JavaException(e);
} catch (ExitException e) {
throw new org.jruby.exceptions.MainExitException(e.getCode());
}
}

Original file line number Diff line number Diff line change
@@ -646,13 +646,7 @@ public Object evalUncached(VirtualFrame frame, DynamicObject mimeType, DynamicOb
protected CallTarget parse(DynamicObject mimeType, DynamicObject source) {
final String mimeTypeString = mimeType.toString();
final Source sourceObject = Source.newBuilder(source.toString()).name("(eval)").mimeType(mimeTypeString).build();

try {
return getContext().getEnv().parse(sourceObject);
} catch (IOException e) {
CompilerDirectives.transferToInterpreterAndInvalidate();
throw new JavaException(e);
}
return getContext().getEnv().parse(sourceObject);
}

protected int getCacheLimit() {