/* 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_NO_DUP_CHECK 0x04 /* skip warning on dups. */
+# define padadd_OUR 0x01 /* our declaration. */
+# define padadd_STATE 0x02 /* state declaration. */
+# define padadd_NO_DUP_CHECK 0x04 /* skip warning on dups. */
#endif
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", \