Don't use $_ as loop variable when calling arbitrary code (RT#81072)

[gitmo/Moo.git] / lib / Moo / _Utils.pm

diff --git a/lib/Moo/_Utils.pm b/lib/Moo/_Utils.pm
index 047f6ca..466f3c1 100644 (file)
--- a/lib/Moo/_Utils.pm
+++ b/lib/Moo/_Utils.pm
@@ -10,14 +10,19 @@ use constant can_haz_subname => eval { require Sub::Name };
 
 use strictures 1;
 use Module::Runtime qw(require_module);
+use Devel::GlobalDestruction ();
 use base qw(Exporter);
 use Moo::_mro;
 
 our @EXPORT = qw(
     _getglob _install_modifier _load_module _maybe_load_module
     _get_linear_isa _getstash _install_coderef _name_coderef
+    _unimport_coderefs _in_global_destruction
 );
 
+sub _in_global_destruction ();
+*_in_global_destruction = \&Devel::GlobalDestruction::in_global_destruction;
+
 sub _install_modifier {
   my ($into, $type, $name, $code) = @_;
 
@@ -62,15 +67,28 @@ sub _get_linear_isa {
 }
 
 sub _install_coderef {
+  no warnings 'redefine';
   *{_getglob($_[0])} = _name_coderef(@_);
 }
 
 sub _name_coderef {
+  shift if @_ > 2; # three args is (target, name, sub)
   can_haz_subname ? Sub::Name::subname(@_) : $_[1];
 }
 
-our $_in_global_destruction = 0;
-END { $_in_global_destruction = 1 }
+sub _unimport_coderefs {
+  my ($target, $info) = @_;
+  return unless $info and my $exports = $info->{exports};
+  my %rev = reverse %$exports;
+  my $stash = _getstash($target);
+  foreach my $name (keys %$exports) {
+    if ($stash->{$name} and defined(&{$stash->{$name}})) {
+      if ($rev{$target->can($name)}) {
+        delete $stash->{$name};
+      }
+    }
+  }
+}
 
 sub STANDARD_DESTROY {
   my $self = shift;
@@ -79,7 +97,7 @@ sub STANDARD_DESTROY {
     local $?;
     local $@;
     eval {
-      $self->DEMOLISHALL($_in_global_destruction);
+      $self->DEMOLISHALL(_in_global_destruction);
     };
     $@;
   };