From: Matt S Trout <mst@shadowcat.co.uk>
Date: Sun, 6 May 2012 22:40:30 +0000 (+0000)
Subject: store coderefs as well as their refaddrs
X-Git-Tag: v1.001003~6
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=12f8eb0b0fddf2f902d34a648e0feb8cb81c0a0f;p=gitmo%2FRole-Tiny.git

store coderefs as well as their refaddrs
---

diff --git a/Changes b/Changes
index 5d603c3..4791c21 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+  - store coderefs as well as their refaddrs to protect against crazy
+
 1.001002 - 2012-05-05
   - alter duplication test to not provoke Class::Method::Modifiers loading
 
diff --git a/lib/Role/Tiny.pm b/lib/Role/Tiny.pm
index cc93081..cd32786 100644
--- a/lib/Role/Tiny.pm
+++ b/lib/Role/Tiny.pm
@@ -62,10 +62,9 @@ sub import {
   # grab all *non-constant* (stash slot is not a scalarref) subs present
   # in the symbol table and store their refaddrs (no need to forcibly
   # inflate constant subs into real subs) - also add '' to here (this
-  # is used later)
-  @{$INFO{$target}{not_methods}={}}{
-    '', map { *$_{CODE}||() } grep !ref($_), values %$stash
-  } = ();
+  # is used later) with a map to the coderefs in case of copying or re-use
+  my @not_methods = ('', map { *$_{CODE}||() } grep !ref($_), values %$stash);
+  @{$INFO{$target}{not_methods}={}}{@not_methods} = @not_methods;
   # a role does itself
   $APPLIED_TO{$target} = { $target => undef };
 }
@@ -236,7 +235,9 @@ sub _concrete_methods_of {
   my $info = $INFO{$role};
   # grab role symbol table
   my $stash = do { no strict 'refs'; \%{"${role}::"}};
-  my $not_methods = $info->{not_methods};
+  # reverse so our keys become the values (captured coderefs) in case
+  # they got copied or re-used since
+  my $not_methods = { reverse %{$info->{not_methods}} };
   $info->{methods} ||= +{
     # grab all code entries that aren't in the not_methods list
     map {