X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=pad.h;h=352a592f8324b986cdaebb3faf1ac494e9032a65;hb=168a53cc0d4ae0ff86a6afb90d36aee4047e7db2;hp=f6c528c2e146d32199169ff14242bb2cb22c2899;hpb=7948fc082b7916e5f602700f36d83fdcf421314c;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/pad.h b/pad.h
index f6c528c..352a592 100644
--- a/pad.h
+++ b/pad.h
@@ -1,6 +1,6 @@
 /*    pad.h
  *
- *    Copyright (C) 2002, 2003, 2005, 2006, 2007 by Larry Wall and others
+ *    Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -37,7 +37,7 @@ typedef U64TYPE PADOFFSET;
 
 #if defined (DEBUGGING) && defined(__GNUC__) && !defined(PERL_GCC_BRACE_GROUPS_FORBIDDEN)
 #  define COP_SEQ_RANGE_LOW(sv)						\
-	(({ SV *const _sv_cop_seq_range_low = (SV *) (sv);		\
+	(({ const SV *const _sv_cop_seq_range_low = (const SV *) (sv);	\
 	  assert(SvTYPE(_sv_cop_seq_range_low) == SVt_NV		\
 		 || SvTYPE(_sv_cop_seq_range_low) >= SVt_PVNV);		\
 	  assert(SvTYPE(_sv_cop_seq_range_low) != SVt_PVAV);		\
@@ -45,10 +45,10 @@ typedef U64TYPE PADOFFSET;
 	  assert(SvTYPE(_sv_cop_seq_range_low) != SVt_PVCV);		\
 	  assert(SvTYPE(_sv_cop_seq_range_low) != SVt_PVFM);		\
 	  assert(!isGV_with_GP(_sv_cop_seq_range_low));			\
-	  ((XPVNV*) SvANY(_sv_cop_seq_range_low))->xnv_u.xpad_cop_seq.xlow; \
+	  ((XPVNV*) MUTABLE_PTR(SvANY(_sv_cop_seq_range_low)))->xnv_u.xpad_cop_seq.xlow; \
 	 }))
 #  define COP_SEQ_RANGE_HIGH(sv)					\
-	(({ SV *const _sv_cop_seq_range_high = (SV *) (sv);		\
+	(({ const SV *const _sv_cop_seq_range_high = (const SV *) (sv);	\
 	  assert(SvTYPE(_sv_cop_seq_range_high) == SVt_NV 		\
                  || SvTYPE(_sv_cop_seq_range_high) >= SVt_PVNV);	\
 	  assert(SvTYPE(_sv_cop_seq_range_high) != SVt_PVAV);		\
@@ -56,10 +56,10 @@ typedef U64TYPE PADOFFSET;
 	  assert(SvTYPE(_sv_cop_seq_range_high) != SVt_PVCV);		\
 	  assert(SvTYPE(_sv_cop_seq_range_high) != SVt_PVFM);		\
 	  assert(!isGV_with_GP(_sv_cop_seq_range_high));		\
-	  ((XPVNV*) SvANY(_sv_cop_seq_range_high))->xnv_u.xpad_cop_seq.xhigh; \
+	  ((XPVNV*) MUTABLE_PTR(SvANY(_sv_cop_seq_range_high)))->xnv_u.xpad_cop_seq.xhigh; \
 	 }))
 #  define PARENT_PAD_INDEX(sv)						\
-	(({ SV *const _sv_parent_pad_index = (SV *) (sv);		\
+	(({ const SV *const _sv_parent_pad_index = (const SV *) (sv);	\
 	  assert(SvTYPE(_sv_parent_pad_index) == SVt_NV			\
 		 || SvTYPE(_sv_parent_pad_index) >= SVt_PVNV);		\
 	  assert(SvTYPE(_sv_parent_pad_index) != SVt_PVAV);		\
@@ -67,10 +67,10 @@ typedef U64TYPE PADOFFSET;
 	  assert(SvTYPE(_sv_parent_pad_index) != SVt_PVCV);		\
 	  assert(SvTYPE(_sv_parent_pad_index) != SVt_PVFM);		\
 	  assert(!isGV_with_GP(_sv_parent_pad_index));			\
-	  ((XPVNV*) SvANY(_sv_parent_pad_index))->xnv_u.xpad_cop_seq.xlow; \
+	  ((XPVNV*) MUTABLE_PTR(SvANY(_sv_parent_pad_index)))->xnv_u.xpad_cop_seq.xlow; \
 	 }))
 #  define PARENT_FAKELEX_FLAGS(sv)					\
-	(({ SV *const _sv_parent_fakelex_flags = (SV *) (sv);		\
+	(({ const SV *const _sv_parent_fakelex_flags = (const SV *) (sv); \
 	  assert(SvTYPE(_sv_parent_fakelex_flags) == SVt_NV  		\
 		 || SvTYPE(_sv_parent_fakelex_flags) >= SVt_PVNV);	\
 	  assert(SvTYPE(_sv_parent_fakelex_flags) != SVt_PVAV);		\
@@ -78,7 +78,7 @@ typedef U64TYPE PADOFFSET;
 	  assert(SvTYPE(_sv_parent_fakelex_flags) != SVt_PVCV);		\
 	  assert(SvTYPE(_sv_parent_fakelex_flags) != SVt_PVFM);		\
 	  assert(!isGV_with_GP(_sv_parent_fakelex_flags));		\
-	  ((XPVNV*) SvANY(_sv_parent_fakelex_flags))->xnv_u.xpad_cop_seq.xhigh;	\
+	  ((XPVNV*) MUTABLE_PTR(SvANY(_sv_parent_fakelex_flags)))->xnv_u.xpad_cop_seq.xhigh; \
 	 }))
 #else
 #  define COP_SEQ_RANGE_LOW(sv)		\
@@ -210,7 +210,7 @@ Restore the old pad saved into the local variable opad by PAD_SAVE_LOCAL()
 
 #define PAD_BASE_SV(padlist, po) \
 	(AvARRAY(padlist)[1]) 	\
-	    ? AvARRAY((AV*)(AvARRAY(padlist)[1]))[po] : NULL;
+	? AvARRAY(MUTABLE_AV((AvARRAY(padlist)[1])))[po] : NULL;
 
 
 #define PAD_SET_CUR_NOSAVE(padlist,nth) \
@@ -239,7 +239,7 @@ 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;					\
+	PL_comppad = opad && SvIS_FREED(opad) ? NULL : opad;	\
 	PL_curpad =  PL_comppad ? AvARRAY(PL_comppad) : NULL;	\
 	DEBUG_Xv(PerlIO_printf(Perl_debug_log,			\
 	      "Pad 0x%"UVxf"[0x%"UVxf"] restore_local\n",	\
@@ -258,7 +258,7 @@ context block structure (can be used as an lvalue).
 */
 
 #define CX_CURPAD_SAVE(block)  (block).oldcomppad = PL_comppad
-#define CX_CURPAD_SV(block,po) (AvARRAY((AV*)((block).oldcomppad))[po])
+#define CX_CURPAD_SV(block,po) (AvARRAY(MUTABLE_AV(((block).oldcomppad)))[po])
 
 
 /*
@@ -337,7 +337,7 @@ Clone the state variables associated with running and compiling pads.
  * sub's CV or padlist. */
 
 #define PAD_CLONE_VARS(proto_perl, param)				\
-    PL_comppad = (AV *) ptr_table_fetch(PL_ptr_table, proto_perl->Icomppad); \
+    PL_comppad = MUTABLE_AV(ptr_table_fetch(PL_ptr_table, proto_perl->Icomppad)); \
     PL_curpad = PL_comppad ?  AvARRAY(PL_comppad) : NULL;		\
     PL_comppad_name		= av_dup(proto_perl->Icomppad_name, param); \
     PL_comppad_name_fill	= proto_perl->Icomppad_name_fill;	\