X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=scope.h;h=29bc4c6e276934251fb3429f568f0a61faf08530;hb=3b355090fae9787919aeb14708ef3dbcf0e7e8eb;hp=8abeb72d9ec9163aaa53090bba4ea8a06e7caf2c;hpb=b5f8cc5c1ad883dce8b5a96bed64f2340aa86716;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/scope.h b/scope.h
index 8abeb72..29bc4c6 100644
--- a/scope.h
+++ b/scope.h
@@ -48,6 +48,7 @@
 #define SAVEt_SHARED_PVREF	37
 #define SAVEt_BOOL		38
 #define SAVEt_SET_SVFLAGS	39
+#define SAVEt_SAVESWITCHSTACK	40
 
 #ifndef SCOPE_SAVES_SIGNAL_MASK
 #define SCOPE_SAVES_SIGNAL_MASK 0
@@ -152,14 +153,14 @@ Closing bracket on a callback.  See C<ENTER> and L<perlcall>.
 #define SAVEOP()	save_op()
 
 #define SAVEHINTS() \
-    STMT_START {				\
-	if (PL_hints & HINT_LOCALIZE_HH)	\
-	    save_hints();			\
-	else {					\
-	    SSCHECK(2);				\
-	    SSPUSHINT(PL_hints);		\
-	    SSPUSHINT(SAVEt_HINTS);		\
-	}					\
+    STMT_START {					\
+	SSCHECK(3);					\
+	if (PL_hints & HINT_LOCALIZE_HH) {		\
+	    SSPUSHPTR(GvHV(PL_hintgv));			\
+	    GvHV(PL_hintgv) = newHVhv(GvHV(PL_hintgv));	\
+	}						\
+	SSPUSHINT(PL_hints);				\
+	SSPUSHINT(SAVEt_HINTS);				\
     } STMT_END
 
 #define SAVECOMPPAD() \
@@ -169,6 +170,16 @@ Closing bracket on a callback.  See C<ENTER> and L<perlcall>.
 	SSPUSHINT(SAVEt_COMPPAD);				\
     } STMT_END
 
+#define SAVESWITCHSTACK(f,t) \
+    STMT_START {					\
+	SSCHECK(3);					\
+	SSPUSHPTR((SV*)(f));				\
+	SSPUSHPTR((SV*)(t));				\
+	SSPUSHINT(SAVEt_SAVESWITCHSTACK);		\
+	SWITCHSTACK((f),(t));				\
+	PL_curstackinfo->si_stack = (t);		\
+    } STMT_END
+
 #ifdef USE_ITHREADS
 #  define SAVECOPSTASH(c)	SAVEPPTR(CopSTASHPV(c))
 #  define SAVECOPSTASH_FREE(c)	SAVESHAREDPV(CopSTASHPV(c))
@@ -383,7 +394,11 @@ typedef void *(CPERLscope(*protect_proc_t)) (pTHX_ volatile JMPENV *pcur_env,
     } STMT_END
 
 #define JMPENV_POP \
-    STMT_START { PL_top_env = cur_env.je_prev; } STMT_END
+    STMT_START {							\
+	DEBUG_l(Perl_deb(aTHX_ "popping jumplevel was %p, now %p\n",	\
+			 PL_top_env, cur_env.je_prev));			\
+	PL_top_env = cur_env.je_prev;					\
+    } STMT_END
 
 #define JMPENV_JUMP(v) \
     STMT_START {						\