Skip to content

Fix raw and varargs backtrace elements#6928

Merged
headius merged 3 commits intojruby:jruby-9.2from
headius:backtrace_fix
Nov 2, 2021
Merged

Fix raw and varargs backtrace elements#6928
headius merged 3 commits intojruby:jruby-9.2from
headius:backtrace_fix

Conversation

@headius
Copy link
Member

@headius headius commented Nov 2, 2021

This is equivalent to #6877 backported to 9.2.

The varargs frame check expected the parsed frame type to be
"varargs", but this type is not produced when processing the jit
method names. Varargs wrappers are seen as "method" which led to
them being included twice.

The fix here stops expecting the "varargs" frame type and relies
on the method name check, which is essentially the same.

Fixes jruby#6846
@headius headius added this to the JRuby 9.2.20.0 milestone Nov 2, 2021
@headius headius changed the base branch from master to jruby-9.2 November 2, 2021 15:29
@headius headius merged commit b0303f2 into jruby:jruby-9.2 Nov 2, 2021
@headius headius deleted the backtrace_fix branch November 2, 2021 16:52
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.

1 participant