Integrate with Sarathy.

p4raw-id: //depot/cfgperl@4520

1 files changed, 14 insertions, 0 deletions

diff --git a/op.c b/op.c
index d0986d0870..b495b076f0 100644
--- a/op.c
+++ b/op.c
@@ -4411,6 +4411,13 @@ Perl_newATTRSUB(pTHX_ I32 floor, OP *o, OP *proto, OP *attrs, OP *block)
 	    av_store(PL_endav, 0, (SV *)cv);
 	    GvCV(gv) = 0;
 	}
+	else if (strEQ(s, "STOP") && !PL_error_count) {
+	    if (!PL_stopav)
+		PL_stopav = newAV();
+	    av_unshift(PL_stopav, 1);
+	    av_store(PL_stopav, 0, (SV *)cv);
+	    GvCV(gv) = 0;
+	}
 	else if (strEQ(s, "INIT") && !PL_error_count) {
 	    if (!PL_initav)
 		PL_initav = newAV();
@@ -4522,6 +4529,13 @@ Perl_newXS(pTHX_ char *name, XSUBADDR_t subaddr, char *filename)
 	    av_store(PL_endav, 0, (SV *)cv);
 	    GvCV(gv) = 0;
 	}
+	else if (strEQ(s, "STOP")) {
+	    if (!PL_stopav)
+		PL_stopav = newAV();
+	    av_unshift(PL_stopav, 1);
+	    av_store(PL_stopav, 0, (SV *)cv);
+	    GvCV(gv) = 0;
+	}
 	else if (strEQ(s, "INIT")) {
 	    if (!PL_initav)
 		PL_initav = newAV();