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

Commits on Dec 15, 2016

  1. [Truffle] Fix option name.

    eregon committed Dec 15, 2016
    Copy the full SHA
    16cc16d View commit details
  2. Copy the full SHA
    b52b437 View commit details
Showing with 4 additions and 4 deletions.
  1. +1 −1 truffle/src/main/java/org/jruby/truffle/core/string/CoreStrings.java
  2. +3 −3 truffle/src/main/ruby/core/kernel.rb
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@ public class CoreStrings {
public CoreStrings(RubyContext context) {
ASSIGNMENT = new CoreString(context, "assignment");
BACKTRACE_OMITTED_LIMIT = new CoreString(context, "(omitted due to -Xtruffle.backtraces.limit)");
BACKTRACE_OMITTED_UNUSED = new CoreString(context, "(omitted as the rescue expression was pure; use -Xtruffle.backtraces.omit_for_unused=false to disable)");
BACKTRACE_OMITTED_UNUSED = new CoreString(context, "(omitted as the rescue expression was pure; use -Xtruffle.backtraces.omit_unused=false to disable)");
CALL = new CoreString(context, "call");
CANT_COMPRESS_NEGATIVE = new CoreString(context, "can't compress negative numbers");
CLASS = new CoreString(context, "class");
6 changes: 3 additions & 3 deletions truffle/src/main/ruby/core/kernel.rb
Original file line number Diff line number Diff line change
@@ -625,10 +625,10 @@ def raise(exc=undefined, msg=undefined, ctx=nil)
end

if $DEBUG and $VERBOSE != nil
if bt = exc.backtrace and bt[1]
pos = bt[1]
if bt = exc.backtrace and !bt.empty?
pos = bt.first
else
pos = Rubinius::VM.backtrace(1)[0].position
pos = caller.first
end

STDERR.puts "Exception: `#{exc.class}' #{pos} - #{exc.message}"