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

Commits on Mar 2, 2016

  1. Revert "[Truffle] Don't need to shutdown in TopLevelRaiseHandler - th… 

    …e ExitException unwind will do that eventually."

This reverts commit 41e39c0.
    @chrisseaton
    chrisseaton committed Mar 2, 2016
    Copy the full SHA
    58f1af9 View commit details

  2. [Truffle] Fix disposing.

    @chrisseaton
    chrisseaton committed Mar 2, 2016
    Copy the full SHA
    40779f0 View commit details
Showing with 3 additions and 2 deletions.
  1. +3 −2 core/src/main/java/org/jruby/Ruby.java
5 changes: 3 additions & 2 deletions core/src/main/java/org/jruby/Ruby.java
View file
Original file line number Diff line number Diff line change
@@ -842,9 +842,10 @@ public IRubyObject runInterpreter(ThreadContext context, Node rootNode, IRubyObj
final JRubyTruffleInterface truffleContext = getTruffleContext();
Main.printTruffleTimeMetric("before-run");
try {
truffleContext.execute((RootNode) rootNode);
truffleContext.execute((RootNode) rootNode);
} finally {
Main.printTruffleTimeMetric("after-run");
Main.printTruffleTimeMetric("after-run");
shutdownTruffleContextIfRunning();
}
return getNil();
} else {