diff options
-rw-r--r-- | ChangeLog | 13 | ||||
-rw-r--r-- | env.h | 1 | ||||
-rw-r--r-- | eval.c | 3 | ||||
-rw-r--r-- | gc.c | 2 | ||||
-rw-r--r-- | parse.y | 3 |
5 files changed, 19 insertions, 3 deletions
@@ -1,3 +1,16 @@ +Sat Mar 3 16:23:13 2007 Akinori MUSHA <knu@iDaemons.org> + + * env.h (SCOPE_CLONE): Introduce a new scope flag to prevent a + local_tbl region from getting freed many times; submitted by + Chikanaga Tomoyuki <chikanag AT nippon-control-system.co.jp> in + [ruby-dev:30460]. + + * eval.c (proc_invoke): Ditto. + + * gc.c (obj_free): Ditto. + + * parse.y (top_local_setup_gen): Ditto. + Sat Mar 3 16:07:02 2007 Akinori MUSHA <knu@iDaemons.org> * object.c (rb_obj_ivar_set): RDoc updated according to a @@ -43,6 +43,7 @@ extern struct SCOPE { #define SCOPE_MALLOC 1 #define SCOPE_NOSTACK 2 #define SCOPE_DONT_RECYCLE 4 +#define SCOPE_CLONE 8 extern int ruby_in_eval; @@ -8553,11 +8553,12 @@ proc_invoke(proc, args, self, klass) if (klass) _block.frame.last_class = klass; _block.frame.argc = RARRAY(tmp)->len; _block.frame.flags = ruby_frame->flags; - if (_block.frame.argc && (ruby_frame->flags & FRAME_DMETH)) { + if (_block.frame.argc && DMETHOD_P()) { NEWOBJ(scope, struct SCOPE); OBJSETUP(scope, tmp, T_SCOPE); scope->local_tbl = _block.scope->local_tbl; scope->local_vars = _block.scope->local_vars; + scope->flags |= SCOPE_CLONE; _block.scope = scope; } /* modify current frame */ @@ -1253,7 +1253,7 @@ obj_free(obj) if (RANY(obj)->as.scope.local_vars && RANY(obj)->as.scope.flags != SCOPE_ALLOCA) { VALUE *vars = RANY(obj)->as.scope.local_vars-1; - if (vars[0] == 0) + if (!(RANY(obj)->as.scope.flags & SCOPE_CLONE) && vars[0] == 0) RUBY_CRITICAL(free(RANY(obj)->as.scope.local_tbl)); if (RANY(obj)->as.scope.flags & SCOPE_MALLOC) RUBY_CRITICAL(free(vars)); @@ -5727,7 +5727,8 @@ top_local_setup() rb_mem_clear(ruby_scope->local_vars+i, len-i); } if (ruby_scope->local_tbl && ruby_scope->local_vars[-1] == 0) { - xfree(ruby_scope->local_tbl); + if (!(ruby_scope->flags & SCOPE_CLONE)) + xfree(ruby_scope->local_tbl); } ruby_scope->local_tbl = local_tbl(); } |