Skip to content

Fix tracer.rb and get it running in CI#5850

Merged
enebo merged 1 commit intojruby:masterfrom
headius:tracer_fixes
Aug 27, 2019
Merged

Fix tracer.rb and get it running in CI#5850
enebo merged 1 commit intojruby:masterfrom
headius:tracer_fixes

Conversation

@headius
Copy link
Member

@headius headius commented Aug 27, 2019

This fixes #5847.

Note that the tracer tests are almost green, except for #5849 causing one failure in interpreted mode. I have excluded that test for now.

This relates to jruby#5847 and jruby#5795.
The diffs from CRuby in our tracer.rb were not quite equivalent
since the original would also accespt a Proc passed as an
argument. I've changed the logic here to use that argument or fall
back on a passed block.

There's also changes to how we invoke event hooks. The first just
unifies the JIT and interpreter to call the same logic. The
the second mimics CRuby when there's a frame klass and it is
either an included module or a singleton. These latter changes fix
the remaining failures in CRuby's test_tracer.rb.
@enebo enebo added this to the JRuby 9.2.9.0 milestone Aug 27, 2019
@enebo enebo merged commit 8779e51 into jruby:master Aug 27, 2019
@headius headius deleted the tracer_fixes branch August 28, 2019 20:18
@headius
Copy link
Member Author

headius commented Aug 28, 2019

The remaining failure was fixed in #5851.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants