Fix public_method_defined in presence of prepend #7577
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
Comparing with the method's defined location causes this to return UNDEFINED since the original definition location would be the unprepended origin class, not matching the new method location after prepending. Fixes jruby#7545
Since jruby#6164 was filed, we started setting jit.background=false whenever jit.threshold=0, since the intent is that all methods JIT before executing. This prevents us failing the deprecated constant test because we no longer cache once in interpreter and again in JIT. It does not fix the issue that when transitiong to JIT code we will recache constants and other values so jruby#6164 is still an issue (if it is really an issue).
headius
force-pushed
the
super_method_in_metaclass
branch
from
8b9543c
to
6b62407
Compare
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.
When we check
public_method_definedwith no parent search on a prepended class, we go to the location of the class's original methods (methodLocation in JRuby) and do the lookup there. This does find the method, but the original logic then rejected it if the methodLocation was not where the method was originally defined (which of course, it wasn't since the method was originally defined on the non-prepended class). The fix here uses the CacheEntry source module, which should match the new prepended location of the original class's methods.