diff options
author | Jeremy Evans <[email protected]> | 2019-10-12 01:02:51 -0700 |
---|---|---|
committer | Nobuyoshi Nakada <[email protected]> | 2019-11-28 19:57:04 +0900 |
commit | a0579f3606561a74e323f6193b9504c06845236c (patch) | |
tree | 3ccff84a2cacdb455ef9259aa15d46eec376b6cb /internal.h | |
parent | 5069c5f5214ce68df8b3954321ad9114c5368dc3 (diff) |
Make prepending a refined module after inclusion not break refinements
After the previous commit, this was still broken. The reason it
was broken is that a refined module that hasn't been prepended to
yet keeps the refined methods in the module's method table. When
prepending, the module's method table is moved to the origin
iclass, and then the refined methods are moved from the method
table to a new method table in the module itself.
Unfortunately, that means that if a class has included the module,
prepending breaks the refinements, because when the methods are
moved from the origin iclass method table to the module method
table, they are removed from the method table from the iclass
created when the module was included earlier.
Fix this by always creating an origin class when including a
module that has any refinements, even if the refinements are
not currently used. I wasn't sure the best way to do that.
The approach I choose was to use an object flag. The flag is
set on the module when Module#refine is called, and if the
flag is present when the module is included in another module
or class, an origin iclass is created for the module.
Fixes [Bug #13446]
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/2550
Diffstat (limited to 'internal.h')
-rw-r--r-- | internal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/internal.h b/internal.h index 50c129e7cd..ca635c9e36 100644 --- a/internal.h +++ b/internal.h @@ -1081,6 +1081,7 @@ int rb_singleton_class_internal_p(VALUE sklass); #define RCLASS_CLONED FL_USER6 #define RICLASS_IS_ORIGIN FL_USER5 +#define RCLASS_REFINED_BY_ANY FL_USER7 static inline void RCLASS_SET_ORIGIN(VALUE klass, VALUE origin) |