From: Shawn M Moore Date: Wed, 27 May 2009 00:10:25 +0000 (-0400) Subject: If the metaclass has been collected, use mro::linearized_isa directly X-Git-Tag: 0.23~3 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=c26e296ac42e07d17388deccbccd6dcb74121e75;p=gitmo%2FMouse.git If the metaclass has been collected, use mro::linearized_isa directly (fix by doy stolen from Moose) --- diff --git a/lib/Mouse/Object.pm b/lib/Mouse/Object.pm index 217b7dc..d81eee5 100644 --- a/lib/Mouse/Object.pm +++ b/lib/Mouse/Object.pm @@ -102,10 +102,23 @@ sub DEMOLISHALL { no strict 'refs'; - for my $class ($self->meta->linearized_isa) { - my $code = *{ $class . '::DEMOLISH' }{CODE} - or next; - $code->($self, @_); + my @isa; + if ( my $meta = Mouse::class_of($self) ) { + @isa = $meta->linearized_isa; + } else { + # We cannot count on being able to retrieve a previously made + # metaclass, _or_ being able to make a new one during global + # destruction. However, we should still be able to use mro at + # that time (at least tests suggest so ;) + my $class_name = ref $self; + @isa = @{ mro::get_linear_isa($class_name) } + } + + foreach my $class (@isa) { + no strict 'refs'; + my $demolish = *{"${class}::DEMOLISH"}{CODE}; + $self->$demolish + if defined $demolish; } }