Cleaner implementations for Perl_clone_params_{new,del}

[perl5.git] / pad.h

diff --git a/pad.h b/pad.h
index e6cee11..8602eda 100644 (file)
--- a/pad.h
+++ b/pad.h
@@ -114,11 +114,11 @@ typedef enum {
 
 #ifdef PERL_CORE
 
-/* flags for pad_add_name/pad_check_dup. SVf_UTF8 will also be valid in the
-   future.  */
+/* flags for pad_add_name. SVf_UTF8 will also be valid in the future.  */
 
-#  define pad_add_OUR  0x01    /* our declaration. */
-#  define pad_add_STATE        0x02    /* state declaration. */
+#  define padadd_OUR           0x01    /* our declaration. */
+#  define padadd_STATE         0x02    /* state declaration. */
+#  define padadd_NO_DUP_CHECK  0x04    /* skip warning on dups. */
 
 #endif
 
@@ -249,7 +249,8 @@ Restore the old pad saved into the local variable opad by PAD_SAVE_LOCAL()
              PTR2UV(PL_comppad), PTR2UV(PL_curpad)));
 
 #define PAD_RESTORE_LOCAL(opad) \
-       PL_comppad = opad && SvIS_FREED(opad) ? NULL : opad;    \
+        assert(!opad || !SvIS_FREED(opad));                                    \
+       PL_comppad = opad;                                              \
        PL_curpad =  PL_comppad ? AvARRAY(PL_comppad) : NULL;   \
        DEBUG_Xv(PerlIO_printf(Perl_debug_log,                  \
              "Pad 0x%"UVxf"[0x%"UVxf"] restore_local\n",       \