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

Commits on Oct 2, 2015

  1. [Truffle] Findbugs.

    @chrisseaton
    chrisseaton committed Oct 2, 2015
    Copy the full SHA
    0832337 View commit details

  2. [Truffle] Coverage is broken with new instrumentation API changes.

    @chrisseaton
    chrisseaton committed Oct 2, 2015
    Copy the full SHA
    770248d View commit details
Showing with 2 additions and 3 deletions.
  1. +2 −2 test/truffle/run.sh
  2. +0 −1 truffle/src/main/java/org/jruby/truffle/runtime/subsystems/TraceManager.java
4 changes: 2 additions & 2 deletions test/truffle/run.sh
View file
Original file line number Diff line number Diff line change
@@ -43,5 +43,5 @@ bin/jruby bin/gem install sinatra
bin/jruby -X+T -Ilib/ruby/gems/shared/gems/rack-1.6.4/lib -Ilib/ruby/gems/shared/gems/tilt-2.0.1/lib -Ilib/ruby/gems/shared/gems/rack-protection-1.5.3/lib -Ilib/ruby/gems/shared/gems/sinatra-1.4.6/lib test/truffle/simple-sinatra-server.rb &
test_server

echo "Coverage..."
bin/jruby -X+T -Xtruffle.coverage=true test/truffle/coverage/test.rb
#echo "Coverage..."
#bin/jruby -X+T -Xtruffle.coverage=true test/truffle/coverage/test.rb
1 change: 0 additions & 1 deletion truffle/src/main/java/org/jruby/truffle/runtime/subsystems/TraceManager.java
View file
Original file line number Diff line number Diff line change
@@ -236,7 +236,6 @@ public BaseAdvancedIntrumentRoot(DynamicObject traceFunc, Object event, Object f
@Override
public Object executeRoot(Node node, VirtualFrame frame) {
if (!inTraceFuncProfile.profile(isInTraceFunc)) {
final Object self = context.getCoreLibrary().getNilObject();
final Object classname = context.getCoreLibrary().getNilObject();
final Object id = context.getCoreLibrary().getNilObject();