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

Commits on Apr 15, 2016

  1. [Truffle] Fix typo.

    @eregon
    eregon committed Apr 15, 2016
    Copy the full SHA
    5615efc View commit details

  2. [Truffle] Prefix by JRUBY_DIR for --bips to allow running out of sour… 

    …ce dir.
    @eregon
    eregon committed Apr 15, 2016
    Copy the full SHA
    8c9ed22 View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 tool/jt.rb
  2. +1 −1 truffle/src/main/java/org/jruby/truffle/core/exception/CoreExceptions.java
2 changes: 1 addition & 1 deletion tool/jt.rb
View file
Original file line number Diff line number Diff line change
@@ -371,7 +371,7 @@ def run(*args)

if args.delete('--bips')
bips_version = '2.6.1'
bips = "lib/ruby/gems/shared/gems/benchmark-ips-#{bips_version}/lib"
bips = "#{JRUBY_DIR}/lib/ruby/gems/shared/gems/benchmark-ips-#{bips_version}/lib"
sh 'bin/jruby', 'bin/gem', 'install', 'benchmark-ips', '-v', bips_version unless Dir.exist?(bips)
jruby_args << "-I#{bips}"
end
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/core/exception/CoreExceptions.java
View file
Original file line number Diff line number Diff line change
@@ -138,7 +138,7 @@ public DynamicObject systemStackErrorStackLevelTooDeep(Node currentNode, Throwab
context.getCallStack().getBacktrace(currentNode, javaThrowable));
}

// ErrnoError
// Errno

@TruffleBoundary
public DynamicObject mathDomainError(String method, Node currentNode) {