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

Commits on Aug 21, 2015

  1. [Truffle] Set -Xtruffle.core.load_path by default for development.

    @chrisseaton
    chrisseaton committed Aug 21, 2015
    Copy the full SHA
    2104a2f View commit details

  2. [Truffle] Fix detection of core source sections.

    @chrisseaton
    chrisseaton committed Aug 21, 2015
    Copy the full SHA
    5cfdf5a View commit details
Showing with 3 additions and 2 deletions.
  1. +1 −1 tool/jt.rb
  2. +2 −1 truffle/src/main/java/org/jruby/truffle/runtime/backtrace/BacktraceFormatter.java
2 changes: 1 addition & 1 deletion tool/jt.rb
View file
Original file line number Diff line number Diff line change
@@ -242,7 +242,7 @@ def rebuild

def run(*args)
env_vars = args.first.is_a?(Hash) ? args.shift : {}
jruby_args = %w[-X+T]
jruby_args = %w[-X+T -Xtruffle.core.load_path=truffle/src/main/ruby]

{ '--asm' => '--graal', '--igv' => '--graal' }.each_pair do |arg, dep|
args.unshift dep if args.include?(arg)
3 changes: 2 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/runtime/backtrace/BacktraceFormatter.java
View file
Original file line number Diff line number Diff line change
@@ -17,6 +17,7 @@
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.control.RaiseException;
import org.jruby.truffle.runtime.layouts.Layouts;
import org.jruby.truffle.runtime.loader.SourceLoader;
import org.jruby.util.cli.Options;

import java.io.PrintWriter;
@@ -186,7 +187,7 @@ private SourceSection nextUserSourceSection(List<Activation> activations, int n)
}

private boolean isCore(SourceSection sourceSection) {
return sourceSection instanceof NullSourceSection || sourceSection.getSource().getPath().startsWith("core:");
return sourceSection instanceof NullSourceSection || sourceSection.getSource().getPath().startsWith(SourceLoader.TRUFFLE_SCHEME);
}

}