X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/35f82371218a026d1f07258ae020fffabf397fdc..231c54e04649cb5e471b633e93b321405f11dbbf:/pad.h

diff --git a/pad.h b/pad.h
index 074d52e..8602eda 100644
--- a/pad.h
+++ b/pad.h
@@ -114,12 +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 pad_add_FAKE	0x04
+#  define padadd_OUR		0x01	/* our declaration. */
+#  define padadd_STATE		0x02	/* state declaration. */
+#  define padadd_NO_DUP_CHECK	0x04	/* skip warning on dups. */
 
 #endif
 
@@ -250,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",	\