From: Jesse Luehrs <doy@tozt.net>
Date: Sun, 7 Feb 2010 05:13:35 +0000 (-0600)
Subject: experimentally don't cache incidentally initialized metaclasses
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fattic%2Ftopic%2Fnonmoose_gets_cmop_meta;p=gitmo%2FMoose.git

experimentally don't cache incidentally initialized metaclasses
---

diff --git a/lib/Moose/Meta/Attribute.pm b/lib/Moose/Meta/Attribute.pm
index 738900f..ed22d65 100644
--- a/lib/Moose/Meta/Attribute.pm
+++ b/lib/Moose/Meta/Attribute.pm
@@ -684,7 +684,7 @@ sub _find_delegate_metaclass {
         # we might be dealing with a non-Moose class,
         # and need to make our own metaclass. if there's
         # already a metaclass, it will be returned
-        return Moose::Meta::Class->initialize($class);
+        return Moose::Meta::Class->initialize($class, no_cache => 1);
     }
     elsif (my $role = $self->_does_metadata) {
         return Class::MOP::class_of($role);
diff --git a/lib/Moose/Meta/Class.pm b/lib/Moose/Meta/Class.pm
index 7600cf6..c1df39f 100644
--- a/lib/Moose/Meta/Class.pm
+++ b/lib/Moose/Meta/Class.pm
@@ -322,29 +322,9 @@ sub _find_next_method_by_name_which_is_not_overridden {
 sub _fix_metaclass_incompatibility {
     my ($self, @superclasses) = @_;
 
-    # We need to initialize the superclasses as Moose::Meta::Class, to give
-    # them a shot at fixing their own metaclass incompatibility from their
-    # parents (which initializing them as Class::MOP::Class wouldn't allow).
-    # However, if they weren't Moose classes to begin with, we shouldn't
-    # leave them with a Moose::Meta::Class metaclass, since that should be
-    # reserved specifically for Moose classes. Therefore, we remove the
-    # metaclasses we create here (that didn't exist before) if metaclass
-    # compat fixing didn't change them at all. -doy
-
-    my %existing_superclass_metas =
-        map  { $_, 1 }
-        grep { Class::MOP::does_metaclass_exist($_) }
-        @superclasses;
-
     $self->_fix_one_incompatible_metaclass($_)
-        for map { Moose::Meta::Class->initialize($_) } @superclasses;
-
-    for my $class (@superclasses) {
-        if (!exists($existing_superclass_metas{$class})
-         && blessed(Class::MOP::get_metaclass_by_name($class)) eq 'Moose::Meta::Class') {
-            Class::MOP::remove_metaclass_by_name($class);
-        }
-    }
+        for map { Moose::Meta::Class->initialize($_, no_cache => 1) }
+                @superclasses;
 }
 
 sub _fix_one_incompatible_metaclass {
@@ -448,8 +428,8 @@ sub _all_metaclasses_differ_by_roles_only {
 
         next if $pair->[0] eq $pair->[1];
 
-        my $self_meta_meta  = Class::MOP::Class->initialize( $pair->[0] );
-        my $super_meta_meta = Class::MOP::Class->initialize( $pair->[1] );
+        my $self_meta_meta  = Class::MOP::Class->initialize( $pair->[0], no_cache => 1 );
+        my $super_meta_meta = Class::MOP::Class->initialize( $pair->[1], no_cache => 1 );
 
         my $common_ancestor
             = _find_common_ancestor( $self_meta_meta, $super_meta_meta );
@@ -499,7 +479,7 @@ sub _is_role_only_subclass_of {
 
     my %role_packages = map { $_->name => 1 } @roles;
 
-    my $ancestor_meta = Class::MOP::Class->initialize($ancestor);
+    my $ancestor_meta = Class::MOP::Class->initialize($ancestor, no_cache => 1);
 
     my %shared_ancestors = map { $_ => 1 } $ancestor_meta->linearized_isa;
 
@@ -544,7 +524,7 @@ sub _all_roles_until {
     for my $class ( $meta->linearized_isa ) {
         last if $stop_at_class && $stop_at_class eq $class;
 
-        my $meta = Class::MOP::Class->initialize($class);
+        my $meta = Class::MOP::Class->initialize($class, no_cache => 1);
         last unless $meta->can('calculate_all_roles');
 
         push @roles, $meta->calculate_all_roles;
@@ -567,7 +547,7 @@ sub _reconcile_role_differences {
     for my $thing (@MetaClassTypes) {
         my $name = $self->$thing();
 
-        my $thing_meta = Class::MOP::Class->initialize($name);
+        my $thing_meta = Class::MOP::Class->initialize($name, no_cache => 1);
 
         my @roles = map { $_->name } _all_roles($thing_meta)
             or next;
diff --git a/t/050_metaclasses/040_moose_nonmoose_metatrait_init_order.t b/t/050_metaclasses/040_moose_nonmoose_metatrait_init_order.t
index 8b35d87..516fab2 100644
--- a/t/050_metaclasses/040_moose_nonmoose_metatrait_init_order.t
+++ b/t/050_metaclasses/040_moose_nonmoose_metatrait_init_order.t
@@ -23,7 +23,7 @@ use Moose::Util qw/find_meta does_role/;
 my $subsubclass_meta = Moose->init_meta( for_class => 'SubSubClassUseBase' );
 ok does_role($subsubclass_meta, 'My::Role'),
     'SubSubClass metaclass does role from grandparent metaclass';
-my $subclass_meta = find_meta('SubClassUseBase');
+my $subclass_meta = Moose::Meta::Class->initialize('SubClassUseBase');
 ok does_role($subclass_meta, 'My::Role'),
     'SubClass metaclass does role from parent metaclass';