1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* class.c (rb_include_class_new), eval.c (rb_using_refinement):

Browse Source 
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
This commit is contained in:
ko1 2013-06-22 20:48:35 +00:00
parent 93ec82ca77
commit 7da562e740
4 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
Sun Jun 23 05:41:32 2013 Koichi Sasada <ko1@atdot.net>
* 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.
Sun Jun 23 01:27:54 2013 Tanaka Akira <akr@fsij.org> Sun Jun 23 01:27:54 2013 Tanaka Akira <akr@fsij.org>
* bignum.c (bytes_zero_p): Removed. * bignum.c (bytes_zero_p): Removed.

4
class.c
View File

@ -689,7 +689,9 @@ rb_include_class_new(VALUE module, VALUE super)
} }
RCLASS_IV_TBL(klass) = RCLASS_IV_TBL(module); RCLASS_IV_TBL(klass) = RCLASS_IV_TBL(module);
RCLASS_CONST_TBL(klass) = RCLASS_CONST_TBL(module); RCLASS_CONST_TBL(klass) = RCLASS_CONST_TBL(module);
RCLASS_M_TBL(klass) = RCLASS_M_TBL(RCLASS_ORIGIN(module));
RCLASS_M_TBL(OBJ_WB_GIVEUP(klass)) = RCLASS_M_TBL(OBJ_WB_GIVEUP(RCLASS_ORIGIN(module)));
RCLASS_SET_SUPER(klass, super); RCLASS_SET_SUPER(klass, super);
if (RB_TYPE_P(module, T_ICLASS)) { if (RB_TYPE_P(module, T_ICLASS)) {
RBASIC_SET_CLASS(klass, RBASIC(module)->klass); RBASIC_SET_CLASS(klass, RBASIC(module)->klass);

4
eval.c
View File

@ -1099,7 +1099,9 @@ rb_using_refinement(NODE *cref, VALUE klass, VALUE module)
FL_SET(module, RMODULE_IS_OVERLAID); FL_SET(module, RMODULE_IS_OVERLAID);
c = iclass = rb_include_class_new(module, superclass); c = iclass = rb_include_class_new(module, superclass);
RCLASS_REFINED_CLASS(c) = klass; RCLASS_REFINED_CLASS(c) = klass;
RCLASS_M_TBL(c) = RCLASS_M_TBL(module);
RCLASS_M_TBL(OBJ_WB_GIVEUP(c)) = RCLASS_M_TBL(OBJ_WB_GIVEUP(module));
module = RCLASS_SUPER(module); module = RCLASS_SUPER(module);
while (module && module != klass) { while (module && module != klass) {
FL_SET(module, RMODULE_IS_OVERLAID); FL_SET(module, RMODULE_IS_OVERLAID);

19
vm_method.c
View File

@ -317,7 +317,24 @@ rb_method_entry_make(VALUE klass, ID mid, rb_method_type_t type,
me->called_id = mid; me->called_id = mid;
me->klass = klass; me->klass = klass;
me->def = def; 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 */ /* check mid */
if (klass == rb_cObject && mid == idInitialize) { if (klass == rb_cObject && mid == idInitialize) {