X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Upper.xs;h=92f9e65b4f0e09573b28c7dd9e8ab6bf54b44607;hb=a06eb7aacdd80daabe3b1565c15b37096ea2b57c;hp=5bf3b496797c67bf67de422a6679e78e27382f3d;hpb=965e21f781c23f8c20242d17d7db745d8c035eb3;p=perl%2Fmodules%2FScope-Upper.git

diff --git a/Upper.xs b/Upper.xs
index 5bf3b49..92f9e65 100644
--- a/Upper.xs
+++ b/Upper.xs
@@ -380,6 +380,9 @@ STATIC void su_ud_localize_init(pTHX_ su_ud_localize *ud, SV *sv, SV *val, SV *e
    t = SvTYPE(SvRV(val));
    deref = 1;
   }
+ } else if (SvROK(sv)) {
+  croak("Invalid %s reference as the localization target",
+                 sv_reftype(SvRV(sv), 0));
  } else {
   STRLEN len, l;
   const char *p = SvPV_const(sv, len), *s;
@@ -537,36 +540,22 @@ STATIC void su_pop(pTHX_ void *ud) {
  SU_UD_DEPTH(ud) = --depth;
 
  if (depth > 0) {
-  I32 i = 1, pad;
+  I32 pad;
 
-  if (pad = SU_UD_PAD(ud)) {
+  if ((pad = SU_UD_PAD(ud))) {
    dMY_CXT;
    do {
+    SU_D(PerlIO_printf(Perl_debug_log,
+          "%p: push a pad slot at depth=%2d scope_ix=%2d save_ix=%2d\n",
+           ud,                       depth, PL_scopestack_ix, PL_savestack_ix));
     save_int(&MY_CXT.stack_placeholder);
    } while (--pad);
   }
-  SAVEDESTRUCTOR_X(su_pop, ud);
-
-  /* Skip depths corresponding to scopes for which leave_scope() might not be
-   * called. */
-  while (depth > 1 && PL_scopestack_ix >= i) {
-   I32 j = PL_scopestack[PL_scopestack_ix - i];
-
-   if (j < PL_savestack_ix)
-    break;
-
-   SU_D(PerlIO_printf(Perl_debug_log,
-    "%p: skip scope%*cat depth=%2d scope_ix=%2d new_top=%2d >= cur_base=%2d\n",
-     ud,           6, ' ',   depth, PL_scopestack_ix - i, j, PL_savestack_ix));
-
-   SU_UD_DEPTH(ud) = --depth;
-
-   ++i;
-  }
 
   SU_D(PerlIO_printf(Perl_debug_log,
           "%p: push destructor at depth=%2d scope_ix=%2d save_ix=%2d\n",
            ud,                       depth, PL_scopestack_ix, PL_savestack_ix));
+  SAVEDESTRUCTOR_X(su_pop, ud);
  } else {
   SU_UD_HANDLER(ud)(aTHX_ ud);
  }