From 649237de8f9e1c784493f4a8f29178ac0e969237 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 7 Jul 2009 08:00:44 +0000 Subject: * gc.c (rb_gc_call_finalizer_at_exit): deal with typed struct like as obj_free(). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23984 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 ++++--- gc.c | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92a8135853..cf68408a9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,11 @@ -Tue Jul 7 16:54:24 2009 Nobuyoshi Nakada +Tue Jul 7 17:00:38 2009 Nobuyoshi Nakada + + * gc.c (rb_gc_call_finalizer_at_exit): deal with typed struct like + as obj_free(). * error.c (rb_typed_struct_is_kind_of): new function to see if the given typed struct. -Tue Jul 7 13:44:49 2009 Nobuyoshi Nakada - * error.c (rb_check_typed_struct): new function to check typed struct. diff --git a/gc.c b/gc.c index b49e221df9..11bcd3b348 100644 --- a/gc.c +++ b/gc.c @@ -2802,6 +2802,9 @@ rb_gc_call_finalizer_at_exit(void) DATA_PTR(p) && RANY(p)->as.data.dfree && RANY(p)->as.basic.klass != rb_cThread && RANY(p)->as.basic.klass != rb_cMutex) { p->as.free.flags = 0; + if (RTYPEDDATA_P(p)) { + RDATA(p)->dfree = RANY(p)->as.typeddata.type->dfree; + } if ((long)RANY(p)->as.data.dfree == -1) { xfree(DATA_PTR(p)); } -- cgit v1.2.3