[proposed PATCH] correctly unlocalise exists on tied/%ENV

Message-ID: <20020504003418.F22026@fdgroup.com>

p4raw-id: //depot/perl@16431

diff --git a/pp_hot.c b/pp_hot.c
index 30653a7..f2387b4 100644 (file)
--- a/pp_hot.c
+++ b/pp_hot.c
@@ -1644,7 +1644,12 @@ PP(pp_helem)
 
     if (SvTYPE(hv) == SVt_PVHV) {
        if (PL_op->op_private & OPpLVAL_INTRO)
-           preeminent = SvRMAGICAL(hv) ? 1 : hv_exists_ent(hv, keysv, 0);
+           preeminent =  
+               ( SvRMAGICAL(hv)
+                 && !mg_find((SV*)hv, PERL_MAGIC_tied)
+                 && !mg_find((SV*)hv, PERL_MAGIC_env)
+               ) ? 1 : hv_exists_ent(hv, keysv, 0);
+
        he = hv_fetch_ent(hv, keysv, lval && !defer, hash);
        svp = he ? &HeVAL(he) : 0;
     }

diff --git a/t/op/local.t b/t/op/local.t
index 9f977b2..d23b200 100755 (executable)
--- a/t/op/local.t
+++ b/t/op/local.t
@@ -130,6 +130,7 @@ print +(!defined $a[0]) ? "" : "not ", "ok 41\n";
     sub TIEHASH { bless {}, $_[0] }
     sub STORE { print "# STORE [@_]\n"; $_[0]->{$_[1]} = $_[2] }
     sub FETCH { my $v = $_[0]->{$_[1]}; print "# FETCH [@_=$v]\n"; $v }
+    sub EXISTS { print "# EXISTS [@_]\n"; exists $_[0]->{$_[1]}; }
     sub DELETE { print "# DELETE [@_]\n"; delete $_[0]->{$_[1]}; }
     sub CLEAR { print "# CLEAR [@_]\n"; %{$_[0]} = (); }
 }