diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-22 20:48:35 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-22 20:48:35 +0000 |
| commit | 7da562e74074eaee8604b6049ff38f8bfccb6ac8 (patch) | |
| tree | 253d6daeb4de305fb80b794ec7d660748adc8c51 /vm_method.c | |
| parent | 93ec82ca77ced0a17d447bbb5a4cca4c2c857567 (diff) | |
* class.c (rb_include_class_new), eval.c (rb_using_refinement):
make classes/modules (who share method table) shady.
If module `a' and `b' shares method table m_tbl and new method
with iseq is added, then write barrier is applied only `a' or `b'.
To avoid this issue, shade such classes/modules.
* vm_method.c (rb_method_entry_make): add write barriers.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41580 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_method.c')
| -rw-r--r-- | vm_method.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/vm_method.c b/vm_method.c index 427ee9b06b..969facc3b1 100644 --- a/vm_method.c +++ b/vm_method.c @@ -317,7 +317,24 @@ rb_method_entry_make(VALUE klass, ID mid, rb_method_type_t type, me->called_id = mid; me->klass = klass; me->def = def; - if (def) def->alias_count++; + + if (def) { + def->alias_count++; + + switch(def->type) { + case VM_METHOD_TYPE_ISEQ: + OBJ_WRITTEN(klass, Qundef, def->body.iseq); + break; + case VM_METHOD_TYPE_IVAR: + OBJ_WRITTEN(klass, Qundef, def->body.attr.location); + break; + case VM_METHOD_TYPE_BMETHOD: + OBJ_WRITTEN(klass, Qundef, def->body.proc); + break; + default:; + /* ignore */ + } + } /* check mid */ if (klass == rb_cObject && mid == idInitialize) { |