remove binary compat from #23156 (remove PL_retstack)

p4raw-id: //depot/perl@23157

8 files changed, 0 insertions, 47 deletions

diff --git a/cop.h b/cop.h
index 16fb824696..fb119b20c6 100644
--- a/cop.h
+++ b/cop.h
@@ -303,7 +303,6 @@ struct block_loop {
 struct block {
     I32		blku_oldsp;	/* stack pointer to copy stuff down to */
     COP *	blku_oldcop;	/* old curcop pointer */
-    I32		blku_SPARE1;	/* XXX for BINCOMPAT 5.8.x */
     I32		blku_oldmarksp;	/* mark stack index */
     I32		blku_oldscopesp;	/* scope stack index */
     PMOP *	blku_oldpm;	/* values of pattern match vars */
diff --git a/embed.fnc b/embed.fnc
index 180d867abf..8ca6b0e85a 100644
--- a/embed.fnc
+++ b/embed.fnc
@@ -596,10 +596,8 @@ p	|void	|pidgone	|Pid_t pid|int status
 Ap	|void	|pmflag		|U32* pmfl|int ch
 p	|OP*	|pmruntime	|OP* pm|OP* expr|OP* repl
 p	|OP*	|pmtrans	|OP* o|OP* expr|OP* repl
-p	|OP*	|pop_return
 Ap	|void	|pop_scope
 p	|OP*	|prepend_elem	|I32 optype|OP* head|OP* tail
-p	|void	|push_return	|OP* o
 Ap	|void	|push_scope
 p	|OP*	|ref		|OP* o|I32 type
 p	|OP*	|refkids	|OP* o|I32 type
diff --git a/embed.h b/embed.h
index 96b6d7c799..9c5ae61d7f 100644
--- a/embed.h
+++ b/embed.h
@@ -823,16 +823,10 @@
 #ifdef PERL_CORE
 #define pmtrans			Perl_pmtrans
 #endif
-#ifdef PERL_CORE
-#define pop_return		Perl_pop_return
-#endif
 #define pop_scope		Perl_pop_scope
 #ifdef PERL_CORE
 #define prepend_elem		Perl_prepend_elem
 #endif
-#ifdef PERL_CORE
-#define push_return		Perl_push_return
-#endif
 #define push_scope		Perl_push_scope
 #ifdef PERL_CORE
 #define ref			Perl_ref
@@ -3451,16 +3445,10 @@
 #ifdef PERL_CORE
 #define pmtrans(a,b,c)		Perl_pmtrans(aTHX_ a,b,c)
 #endif
-#ifdef PERL_CORE
-#define pop_return()		Perl_pop_return(aTHX)
-#endif
 #define pop_scope()		Perl_pop_scope(aTHX)
 #ifdef PERL_CORE
 #define prepend_elem(a,b,c)	Perl_prepend_elem(aTHX_ a,b,c)
 #endif
-#ifdef PERL_CORE
-#define push_return(a)		Perl_push_return(aTHX_ a)
-#endif
 #define push_scope()		Perl_push_scope(aTHX)
 #ifdef PERL_CORE
 #define ref(a,b)		Perl_ref(aTHX_ a,b)
diff --git a/embedvar.h b/embedvar.h
index 2f404b51ad..47056d28b6 100644
--- a/embedvar.h
+++ b/embedvar.h
@@ -126,9 +126,6 @@
 #define PL_regstartp		(vTHX->Tregstartp)
 #define PL_regtill		(vTHX->Tregtill)
 #define PL_restartop		(vTHX->Trestartop)
-#define PL_retstack		(vTHX->Tretstack)
-#define PL_retstack_ix		(vTHX->Tretstack_ix)
-#define PL_retstack_max		(vTHX->Tretstack_max)
 #define PL_rs			(vTHX->Trs)
 #define PL_savestack		(vTHX->Tsavestack)
 #define PL_savestack_ix		(vTHX->Tsavestack_ix)
@@ -853,9 +850,6 @@
 #define PL_Tregstartp		PL_regstartp
 #define PL_Tregtill		PL_regtill
 #define PL_Trestartop		PL_restartop
-#define PL_Tretstack		PL_retstack
-#define PL_Tretstack_ix		PL_retstack_ix
-#define PL_Tretstack_max	PL_retstack_max
 #define PL_Trs			PL_rs
 #define PL_Tsavestack		PL_savestack
 #define PL_Tsavestack_ix	PL_savestack_ix
diff --git a/perlapi.h b/perlapi.h
index dadc898cc5..b74d1dbb10 100644
--- a/perlapi.h
+++ b/perlapi.h
@@ -856,12 +856,6 @@ END_EXTERN_C
 #define PL_regtill		(*Perl_Tregtill_ptr(aTHX))
 #undef  PL_restartop
 #define PL_restartop		(*Perl_Trestartop_ptr(aTHX))
-#undef  PL_retstack
-#define PL_retstack		(*Perl_Tretstack_ptr(aTHX))
-#undef  PL_retstack_ix
-#define PL_retstack_ix		(*Perl_Tretstack_ix_ptr(aTHX))
-#undef  PL_retstack_max
-#define PL_retstack_max		(*Perl_Tretstack_max_ptr(aTHX))
 #undef  PL_rs
 #define PL_rs			(*Perl_Trs_ptr(aTHX))
 #undef  PL_savestack
diff --git a/proto.h b/proto.h
index 39a5e203b8..5d27377bf8 100644
--- a/proto.h
+++ b/proto.h
@@ -572,10 +572,8 @@ PERL_CALLCONV void	Perl_pidgone(pTHX_ Pid_t pid, int status);
 PERL_CALLCONV void	Perl_pmflag(pTHX_ U32* pmfl, int ch);
 PERL_CALLCONV OP*	Perl_pmruntime(pTHX_ OP* pm, OP* expr, OP* repl);
 PERL_CALLCONV OP*	Perl_pmtrans(pTHX_ OP* o, OP* expr, OP* repl);
-PERL_CALLCONV OP*	Perl_pop_return(pTHX);
 PERL_CALLCONV void	Perl_pop_scope(pTHX);
 PERL_CALLCONV OP*	Perl_prepend_elem(pTHX_ I32 optype, OP* head, OP* tail);
-PERL_CALLCONV void	Perl_push_return(pTHX_ OP* o);
 PERL_CALLCONV void	Perl_push_scope(pTHX);
 PERL_CALLCONV OP*	Perl_ref(pTHX_ OP* o, I32 type);
 PERL_CALLCONV OP*	Perl_refkids(pTHX_ OP* o, I32 type);
diff --git a/scope.c b/scope.c
index 8420744b7c..54d0ac1755 100644
--- a/scope.c
+++ b/scope.c
@@ -100,20 +100,6 @@ Perl_cxinc(pTHX)
     return cxstack_ix + 1;
 }
 
-/* XXX for 5.8.X BINCOMPAT only */
-void
-Perl_push_return(pTHX_ OP *retop)
-{
-    Perl_croak(aTHX_ "panic: obsolete function push_return() called");
-}
-
-/* XXX for 5.8.X BINCOMPAT only */
-OP *
-Perl_pop_return(pTHX)
-{
-    Perl_croak(aTHX_ "panic: obsolete function pop_return() called");
-}
-
 void
 Perl_push_scope(pTHX)
 {
diff --git a/thrdvar.h b/thrdvar.h
index ede3cc1858..6d5471fa2d 100644
--- a/thrdvar.h
+++ b/thrdvar.h
@@ -56,10 +56,6 @@ PERLVAR(Tmarkstack,	I32 *)		/* stack_sp locations we're remembering */
 PERLVAR(Tmarkstack_ptr,	I32 *)
 PERLVAR(Tmarkstack_max,	I32 *)
 
-PERLVAR(Tretstack,	OP **)		/* XXX for 5.8.x BINCOMPAT */
-PERLVAR(Tretstack_ix,	I32)		/* XXX for 5.8.x BINCOMPAT */
-PERLVAR(Tretstack_max,	I32)		/* XXX for 5.8.x BINCOMPAT */
-
 PERLVAR(TSv,		SV *)		/* used to hold temporary values */
 PERLVAR(TXpv,		XPV *)		/* used to hold temporary values */