Use real stack trace for autoload const location #7712
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Autoload constants should show their assigned location as the point at which autoload was called. This was broken in the JIT because it depended on artificial Backtrace frames that JIT- compiled code does not populate. This patch switches the logic to use a real generated backtrace frame, making it accurate in all cases. This has the side effect of using our fully-canonicalized path from the backtrace as the file location of the constant, which may not match CRuby's uncanonicalized paths. This breaks the same CRuby test that was getting incorrect line numbers before: 1) Failure: TestAutoload#test_source_location [/Users/headius/work/jruby/test/mri/ruby/test_autoload.rb:440]: <"/var/folders/h_/tmq357111c18sxbwlyq34mh80000gn/T/autoload20230302-39483-kwznu0/test-Bug16764.rb"> expected but was <"/private/var/folders/h_/tmq357111c18sxbwlyq34mh80000gn/T/autoload20230302-39483-kwznu0/test-Bug16764.rb">. Fixes jruby#7711 but introduces a new (minor?) incompatibility
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Autoload constants should show their assigned location as the point at which autoload was called. This was broken in the JIT because it depended on artificial Backtrace frames that JIT- compiled code does not populate.
This patch switches the logic to use a real generated backtrace frame, making it accurate in all cases.
This has the side effect of using our fully-canonicalized path from the backtrace as the file location of the constant, which may not match CRuby's uncanonicalized paths. This breaks the same CRuby test that was getting incorrect line numbers before:
TestAutoload#test_source_location [/Users/headius/work/jruby/test/mri/ruby/test_autoload.rb:440]: <"/var/folders/h_/tmq357111c18sxbwlyq34mh80000gn/T/autoload20230302-39483-kwznu0/test-Bug16764.rb"> expected but was <"/private/var/folders/h_/tmq357111c18sxbwlyq34mh80000gn/T/autoload20230302-39483-kwznu0/test-Bug16764.rb">.
Fixes #7711 but introduces a new (minor?) incompatibility