Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from Aug 27, 2019
Merged

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

merged 1 commit into from Aug 27, 2019

Conversation

@headius
Copy link
Member

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 #5847 and #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
5 checks passed
5 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
jruby.jruby Build #20190827.4 succeeded
Details
jruby.jruby (Job linux) Job linux succeeded
Details
jruby.jruby (Job mac) Job mac succeeded
Details
jruby.jruby (Job windows) Job windows succeeded
Details
@headius headius deleted the headius:tracer_fixes branch Aug 28, 2019
@headius

This comment has been minimized.

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
Projects
None yet
2 participants
You can’t perform that action at this time.