Fix AUTOLOAD, or kill me

1 files changed, 7 insertions, 4 deletions

diff --git a/t/op/method.t b/t/op/method.t
index bdbc8a9673..21d7c8f397 100755
--- a/t/op/method.t
+++ b/t/op/method.t
@@ -64,6 +64,7 @@ test (eval { A->x } || "nope", "nope");
 
 eval <<'EOF';
 sub C::e;
+BEGIN { *B::e = \&C::e }	# Shouldn't prevent AUTOLOAD in original pkg
 sub Y::f;
 $counter = 0;
 
@@ -73,14 +74,16 @@ $counter = 0;
 sub B::AUTOLOAD {
   my $c = ++$counter;
   my $method = $B::AUTOLOAD; 
-  *$B::AUTOLOAD = sub { "B: In $method, $c" };
-  goto &$B::AUTOLOAD;
+  my $msg = "B: In $method, $c";
+  eval "sub $method { \$msg }";
+  goto &$method;
 }
 sub C::AUTOLOAD {
   my $c = ++$counter;
   my $method = $C::AUTOLOAD; 
-  *$C::AUTOLOAD = sub { "C: In $method, $c" };
-  goto &$C::AUTOLOAD;
+  my $msg = "C: In $method, $c";
+  eval "sub $method { \$msg }";
+  goto &$method;
 }
 EOF