X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Upper.xs;h=6ff176d68d913973734a80e8bde1d18b85eec2eb;hb=915ea103e7467eb15f3e5a37c4d4329a2803ea3a;hp=e810d69b77603810c207334ee09fcb24e3cf1e6c;hpb=05e5544f3e55b668c38fe41c5a3749c2d02c8131;p=perl%2Fmodules%2FScope-Upper.git diff --git a/Upper.xs b/Upper.xs index e810d69..6ff176d 100644 --- a/Upper.xs +++ b/Upper.xs @@ -900,24 +900,26 @@ static void su_localize(pTHX_ void *ud_) { if (SvTYPE(sv) >= SVt_PVGV) { gv = (GV *) sv; } else { - /* new perl context implementation frees savestack *before* restoring * PL_curcop. Temporarily restore it prematurely to make gv_fetch* * looks up unqualified var names in the caller's package */ #if SU_HAS_NEW_CXT COP *old_cop = PL_curcop; - PL_curcop = CX_CUR()->blk_oldcop; + PL_curcop = CX_CUR()->blk_oldcop; #endif #ifdef gv_fetchsv gv = gv_fetchsv(sv, GV_ADDMULTI, t); #else - STRLEN len; - const char *name = SvPV_const(sv, len); - gv = gv_fetchpvn_flags(name, len, GV_ADDMULTI, t); + { + STRLEN len; + const char *name = SvPV_const(sv, len); + gv = gv_fetchpvn_flags(name, len, GV_ADDMULTI, t); + } #endif + #if SU_HAS_NEW_CXT - CX_CUR()->blk_oldcop = PL_curcop; + CX_CUR()->blk_oldcop = old_cop; #endif }