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

Commits on Feb 18, 2015

  1. [Truffle] Also dump on error if debugging a benchmark fails.

    @chrisseaton
    chrisseaton committed Feb 18, 2015
    Copy the full SHA
    061df71 View commit details

  2. [Truffle] Fix chunky-encode-png-image-pass-to-stream.

    @chrisseaton
    chrisseaton committed Feb 18, 2015
    2
    Copy the full SHA
    2238abf View commit details
Showing with 2 additions and 1 deletion.
  1. +1 −1 tool/jt.rb
  2. +1 −0 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
@@ -206,7 +206,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'})
env_vars = env_vars.merge({'JRUBY_OPTS' => '-J-G:+TraceTruffleCompilation -J-G:+DumpOnError'})
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'
1 change: 1 addition & 0 deletions truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
View file
Original file line number Diff line number Diff line change
@@ -216,6 +216,7 @@ public ConcatNode(ConcatNode prev) {
return ToStrNodeFactory.create(getContext(), getSourceSection(), other);
}

@TruffleBoundary
@Specialization
public RubyString concat(RubyString string, RubyString other) {
// TODO (nirvdrum 06-Feb-15) This shouldn't be designed for compilation because we don't support all the String semantics yet, but a bench9000 benchmark has it on a hot path, so commenting out for now.