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

Commits on Apr 2, 2015

  1. [Truffle] String#initialize_copy is okay for compilation.

    @nirvdrum
    nirvdrum committed Apr 2, 2015
    Copy the full SHA
    f44dc6b View commit details

  2. [Truffle] Show backtraces when compilation fails in benchmarks in deb… 

    …ug mode.
    @nirvdrum
    nirvdrum committed Apr 2, 2015
    Copy the full SHA
    9fe48f1 View commit details
Showing with 1 addition and 3 deletions.
  1. +1 −1 tool/jt.rb
  2. +0 −2 truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
2 changes: 1 addition & 1 deletion tool/jt.rb
View file
Original file line number Diff line number Diff line change
@@ -275,7 +275,7 @@ def bench(command, *args)
bench_args = ["-I#{bench_dir}/lib", "#{bench_dir}/bin/bench"]
case command
when 'debug'
env_vars = env_vars.merge({'JRUBY_OPTS' => '-J-G:+TraceTruffleCompilation -J-G:+DumpOnError'})
env_vars = env_vars.merge({'JRUBY_OPTS' => '-J-G:+TraceTruffleCompilation -J-G:+DumpOnError -J-G:+TruffleCompilationExceptionsAreThrown'})
bench_args += ['score', 'jruby-9000-dev-truffle-graal', '--show-commands', '--show-samples']
raise 'specify a single benchmark for run - eg classic-fannkuch-redux' if args.size != 1
when 'reference'
2 changes: 0 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
View file
Original file line number Diff line number Diff line change
@@ -1266,8 +1266,6 @@ public InitializeCopyNode(InitializeCopyNode prev) {

@Specialization
public Object initializeCopy(RubyString self, RubyString from) {
notDesignedForCompilation();

if (self == from) {
return self;
}