Integrate change #10667 from maintperl:
Jarkko Hietaniemi [Sun, 17 Jun 2001 19:13:24 +0000 (19:13 +0000)]
change#10449 broke the special-case that makes lexicals inside the
eval"" within DB::DB() visible

p4raw-link: @10667 on //depot/maint-5.6/perl: 09e74a2b2e364b35ece2056bb3ea8e25db9a89f2
p4raw-link: @10449 on //depot/perl: 2090ab20212398e485f20cd7e50303dcd3601be7

p4raw-id: //depot/perl@10668
p4raw-integrated: from //depot/maint-5.6/perl@10666 'merge in' op.c
(@10472..)

op.c

diff --git a/op.c b/op.c
index 73061e3..ee90f2d 100644 (file)
--- a/op.c
+++ b/op.c
@@ -378,6 +378,7 @@ S_pad_findlex(pTHX_ char *name, PADOFFSET newoff, U32 seq, CV* startcv,
            cv = cx->blk_sub.cv;
            if (PL_debstash && CvSTASH(cv) == PL_debstash) {    /* ignore DB'* scope */
                saweval = i;    /* so we know where we were called from */
+               seq = cxstack[i].blk_oldcop->cop_seq;
                continue;
            }
            return pad_findlex(name, newoff, seq, cv, i-1, saweval,FINDLEX_NOSEARCH);