Fix subtly buggy code that used to work for entirely the wrong reason…

…. Deals with another regression.
rakudo · Aug 31, 2012 · 6c8ef80 · 6c8ef80
1 parent 44f06cf
commit 6c8ef80
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/Perl6/Metamodel/AttributeContainer.pm b/src/Perl6/Metamodel/AttributeContainer.pm
@@ -21,12 +21,16 @@ role Perl6::Metamodel::AttributeContainer {
     method compose_attributes($obj) {
         my %seen_with_accessor;
         my %meths := self.method_table($obj);
+        my %orig_meths;
+        for %meths {
+            %orig_meths{$_.key} := 1;
+        }
         for @!attributes {
             if $!attr_rw_by_default { $_.default_to_rw() }
             if $_.has_accessor() {
                 my $acc_name := nqp::substr($_.name, 2);
                 nqp::die("Two or more attributes declared that both want an accessor method '$acc_name'")
-                    if %seen_with_accessor{$acc_name} && !nqp::existskey(%meths, $acc_name);
+                    if %seen_with_accessor{$acc_name} && !nqp::existskey(%orig_meths, $acc_name);
                 %seen_with_accessor{$acc_name} := 1;
             }
             $_.compose($obj);