From e956f28724a40de9b51b8d049e259af96dc738d5 Mon Sep 17 00:00:00 2001 From: matz Date: Mon, 11 Aug 2008 08:13:42 +0000 Subject: [PATCH] * class.c (clone_method): should copy cbase in cref as well. [ruby-dev:35116] * iseq.c (iseq_mark): mark original iseq object. * iseq.c (iseq_free): do not free internal data if they have original iseq to belong. * iseq.c (rb_iseq_clone): a new function to clone iseq value. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18490 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 12 ++++++++++++ class.c | 10 +++++++++- iseq.c | 52 ++++++++++++++++++++++++++++++++++++++-------------- vm_core.h | 1 + 4 files changed, 60 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index bff9444219..67b40c97f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,18 @@ Mon Aug 11 16:56:40 2008 TAKAO Kouji * test/readline/test_readline.rb: added test for Readline's class methods. +Mon Aug 11 16:39:23 2008 Yukihiro Matsumoto + + * class.c (clone_method): should copy cbase in cref as well. + [ruby-dev:35116] + + * iseq.c (iseq_mark): mark original iseq object. + + * iseq.c (iseq_free): do not free internal data if they have + original iseq to belong. + + * iseq.c (rb_iseq_clone): a new function to clone iseq value. + Mon Aug 11 16:34:48 2008 Tanaka Akira * enc/trans/iso2022.trans: renamed from iso2022.erb.c. diff --git a/class.c b/class.c index 0d612a5e87..91ba3e6361 100644 --- a/class.c +++ b/class.c @@ -13,6 +13,7 @@ #include "ruby/signal.h" #include "ruby/node.h" #include "ruby/st.h" +#include "vm_core.h" #include extern st_table *rb_class_tbl; @@ -78,10 +79,17 @@ clone_method(ID mid, NODE *body, struct clone_method_data *data) st_insert(data->tbl, mid, 0); } else { + NODE *fbody = body->nd_body->nd_body; + + if (nd_type(fbody) == RUBY_VM_METHOD_NODE) { + fbody = NEW_NODE(RUBY_VM_METHOD_NODE, 0, + rb_iseq_clone((VALUE)fbody->nd_body, data->klass), + 0); + } st_insert(data->tbl, mid, (st_data_t) NEW_FBODY( - NEW_METHOD(body->nd_body->nd_body, + NEW_METHOD(fbody, data->klass, /* TODO */ body->nd_body->nd_noex), 0)); diff --git a/iseq.c b/iseq.c index 84bef80420..f5dd37d264 100644 --- a/iseq.c +++ b/iseq.c @@ -48,20 +48,22 @@ iseq_free(void *ptr) if (ptr) { iseq = ptr; - /* It's possible that strings are freed - * GC_INFO("%s @ %s\n", RSTRING_PTR(iseq->name), - * RSTRING_PTR(iseq->filename)); - */ - if (iseq->iseq != iseq->iseq_encoded) { - RUBY_FREE_UNLESS_NULL(iseq->iseq_encoded); - } + if (!iseq->orig) { + /* It's possible that strings are freed + * GC_INFO("%s @ %s\n", RSTRING_PTR(iseq->name), + * RSTRING_PTR(iseq->filename)); + */ + if (iseq->iseq != iseq->iseq_encoded) { + RUBY_FREE_UNLESS_NULL(iseq->iseq_encoded); + } - RUBY_FREE_UNLESS_NULL(iseq->iseq); - RUBY_FREE_UNLESS_NULL(iseq->insn_info_table); - RUBY_FREE_UNLESS_NULL(iseq->local_table); - RUBY_FREE_UNLESS_NULL(iseq->catch_table); - RUBY_FREE_UNLESS_NULL(iseq->arg_opt_table); - compile_data_free(iseq->compile_data); + RUBY_FREE_UNLESS_NULL(iseq->iseq); + RUBY_FREE_UNLESS_NULL(iseq->insn_info_table); + RUBY_FREE_UNLESS_NULL(iseq->local_table); + RUBY_FREE_UNLESS_NULL(iseq->catch_table); + RUBY_FREE_UNLESS_NULL(iseq->arg_opt_table); + compile_data_free(iseq->compile_data); + } ruby_xfree(ptr); } RUBY_FREE_LEAVE("iseq"); @@ -84,6 +86,7 @@ iseq_mark(void *ptr) RUBY_MARK_UNLESS_NULL(iseq->coverage); /* RUBY_MARK_UNLESS_NULL((VALUE)iseq->node); */ /* RUBY_MARK_UNLESS_NULL(iseq->cached_special_block); */ + RUBY_MARK_UNLESS_NULL(iseq->orig); if (iseq->compile_data != 0) { RUBY_MARK_UNLESS_NULL(iseq->compile_data->mark_ary); @@ -910,7 +913,7 @@ iseq_s_disasm(VALUE klass, VALUE body) if ((node = rb_method_body(body)) != 0) { if (nd_type(node) == RUBY_VM_METHOD_NODE) { - VALUE iseqval = (VALUE)node->nd_body; + VALUE iseqval = (VALUE)node->nd_body; ret = ruby_iseq_disasm(iseqval); } } @@ -1227,6 +1230,27 @@ insn_make_insn_table(void) return table; } +VALUE +rb_iseq_clone(VALUE iseqval, VALUE newcbase) +{ + VALUE newiseq = iseq_alloc(rb_cISeq); + rb_iseq_t *iseq0, *iseq1; + + GetISeqPtr(iseqval, iseq0); + GetISeqPtr(newiseq, iseq1); + + *iseq1 = *iseq0; + iseq1->self = newiseq; + if (!iseq1->orig) { + iseq1->orig = iseqval; + } + if (newcbase) { + iseq1->cref_stack = NEW_BLOCK(newcbase); + } + + return newiseq; +} + /* ruby2cext */ VALUE diff --git a/vm_core.h b/vm_core.h index 88087a7dbc..f1a24e5f94 100644 --- a/vm_core.h +++ b/vm_core.h @@ -261,6 +261,7 @@ struct rb_iseq_struct { /****************/ VALUE self; + VALUE orig; /* non-NULL if its data have origin */ /* block inlining */ /*