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

Commits on Aug 26, 2016

  1. Copy the full SHA
    3067e1a View commit details
  2. Copy the full SHA
    24baa5b View commit details
  3. Copy the full SHA
    f213c8f View commit details
12 changes: 12 additions & 0 deletions ci.hocon
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
# Configuration values

# Must be the same as in truffle/pom.rb and mx.jruby/suite.py
truffle-version: 5e141bd0895239307edb5a4c64eaccb7d37409ef

jt: [ruby, tool/jt.rb]

# Allow a version mismatch with truffle to prefer the language truffle version
clone_graal: [mx, --version-conflict-resolution, ignore, sclone, --kind, git]

# Use Truffle version of the language
use-language-truffle: ["&&", git, fetch, "&&", git, reset, --hard, ${truffle-version}, "&&"]

common-setup: [
[mx, sclone, --kind, git, "https://github.com/jruby/jruby-build-pack.git", jruby-build-pack],
[cp, bin/jruby.bash, bin/jruby],
@@ -53,6 +61,7 @@ graal-core: {
${clone_graal} ["https://github.com/graalvm/graal-core.git", graal-core],
[cd, graal-core],
[mx, sforceimports],
[cd, ../truffle] ${use-language-truffle} [cd, ../graal-core],
[mx, --java-home, "$JVMCI_JAVA_HOME", build],
[cd, ../..],
[mv, temp_mx, mx.jruby]
@@ -81,6 +90,7 @@ graal-enterprise: {
${clone_graal} ["https://github.com/graalvm/graal-enterprise.git", graal-enterprise],
[cd, graal-enterprise/graal-enterprise],
[mx, sforceimports],
[cd, ../../truffle] ${use-language-truffle} [cd, ../graal-enterprise/graal-enterprise],
[mx, --java-home, "$JVMCI_JAVA_HOME", build],
[cd, ../../..],
[mv, temp_mx, mx.jruby]
@@ -315,6 +325,7 @@ test-cexts: {
[mx, sclone, --kind, git, "https://github.com/graalvm/sulong.git", sulong],
[cd, sulong],
[mx, sforceimports],
[cd, ../truffle] ${use-language-truffle} [cd, ../sulong],
[mx, --java-home, "$JVMCI_JAVA_HOME", build],
[cd, ../..],
[mv, temp_mx, mx.jruby]
@@ -366,6 +377,7 @@ sulong-benchmarks: {
[mx, sclone, --kind, git, "https://github.com/graalvm/sulong.git", sulong],
[cd, sulong],
[mx, sforceimports],
[cd, ../truffle] ${use-language-truffle} [cd, ../sulong],
[mx, --java-home, "$JVMCI_JAVA_HOME", build],
[cd, ../..],
[mv, temp_mx, mx.jruby],
2 changes: 1 addition & 1 deletion mx.jruby/suite.py
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ def mavenLib(mavenDep, sha1):
"suites": [
{
"name": "truffle",
"version": "387cbe478688e84d211aa534b7b93d47709cadd9",
"version": "5e141bd0895239307edb5a4c64eaccb7d37409ef",
"urls": [
{"url": "https://github.com/graalvm/truffle.git", "kind": "git"},
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
4 changes: 2 additions & 2 deletions truffle/.factorypath
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<factorypath>
<factorypathentry kind="VARJAR" id="M2_REPO/com/oracle/truffle/truffle-api/0.13/truffle-api-0.13.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/oracle/truffle/truffle-dsl-processor/0.13/truffle-dsl-processor-0.13.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/oracle/truffle/truffle-api/5e141bd0895239307edb5a4c64eaccb7d37409ef-SNAPSHOT/truffle-api-5e141bd0895239307edb5a4c64eaccb7d37409ef-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/oracle/truffle/truffle-dsl-processor/5e141bd0895239307edb5a4c64eaccb7d37409ef-SNAPSHOT/truffle-dsl-processor-5e141bd0895239307edb5a4c64eaccb7d37409ef-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
</factorypath>
2 changes: 1 addition & 1 deletion 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' => '5e141bd0895239307edb5a4c64eaccb7d37409ef-SNAPSHOT',
'jruby.basedir' => '${basedir}/..',
'maven.test.skip' => 'true' )

2 changes: 1 addition & 1 deletion 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>5e141bd0895239307edb5a4c64eaccb7d37409ef-SNAPSHOT</truffle.version>
</properties>
<dependencies>
<dependency>
16 changes: 3 additions & 13 deletions truffle/src/main/java/org/jruby/truffle/JRubyTruffleImpl.java
Original file line number Diff line number Diff line change
@@ -15,7 +15,6 @@
import org.jruby.Ruby;
import org.jruby.truffle.interop.JRubyContextWrapper;
import org.jruby.truffle.language.control.ExitException;
import org.jruby.truffle.language.control.JavaException;
import org.jruby.truffle.platform.graal.Graal;
import org.jruby.util.cli.Options;

@@ -32,11 +31,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 +46,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
@@ -647,12 +647,7 @@ 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() {