Conversation
MRI's data structures for managing method tables are very similar
to ours, so I'm following their pattern of inserting wrapper or
dummy refined entries into classes that get refined elsewhere in
the system.
Here's a summary of the logic:
When defining a method:
* If the method does not already exist and the target module is a
refinement module (isRefinement), add a refined method entry to
the related class.
* If the method also exists on the target class, wrap the
existing method with a refined entry.
Because we always search for a refined marker in the class
hierarchy, we know which refined class to look for; this will fix
issues with refining a superclass of the target type, broken
currently.
When dispatching:
* Look for the method in the target class.
* If the entry is not marked as refined, return it.
* If the resulting entry is refined, search the refinement scope
for a refined version of the method.
* If there's no refined version of the method in the refinement
scope:
* If the entry is a wrapper, return the wrapped method.
* If the entry is a marker, continue the search up the
hierarchy.
* This uses the owned class of the discovered unrefined method as
the "super" class for the refinement, allowing supers to work
from there.
This gets back to most functionality working plus a number of new tests passing. The RefinedMarker instances are still leaking out to various places, which is the cause of most of the regressed tests.
MRI does this in vm_cref_new, which I believe is called on first entry to a method, block, or module body. In their case, they reference the original overlay module and mark it as shared. Any subsequent modifications cause it to be replaced on the parent scopes. In JRuby, I am currently only propagating refinements into class/module and method bodies, which means blocks and evals and such still need to search up the hierarchy a bit. I am also doing a hard copy of the related collection, which could add overhead to boot time.
MRI's logic for an existing method that gets refined expects that it will be wrapped by a refinement marker. This allows the original method to be pulled out and look unrefined for other logic we also mimic. Since currently I do not wrap, but instead flag, the original method, there's no way to get an original that isn't refined without duping the method here. This is inefficient and may lead to peculiar side effects so I will return to using a full wrapper in a subsequent commit.
This is necessary to handle refined to_s calls from interpolated strings, as in MRI test_refinement.rb test_tostring.
This logic modifies all calls with non-literal procs to pass the current scope through, and modifies the coercion logic to handle Symbol specially by passing the scope in. This will in turn use refinements when present. Note that this is not quite as optimal as the SymbolProc operand but is still static for the creation of the proc.
This is not quite the right logic, since MRI will copy refinements into each level and only search the one level. We do not consistently do that, so we still search the scope hierarchy for other refinements. This is inefficient and should change, but this patch at least allows mutually-dependent refine blocks to see each other.
This was referenced Feb 26, 2019
Closed
This file contains hidden or 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
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.
This is a reworking of the refinements logic in JRuby to use a mechanism similar to MRI, with marker entries in method tables to indicate that a given class + method has been refined somewhere.
There are a few pieces missing but this gets most refinement tests passing.
To do:
This branch is green but has a handful of specs/tests excluded due to the above. Branch
refinements2has ongoing work on the super issue.