Initial 3-way merge from (5.001m, thr1m, 5.003) plus fixups.

p4raw-id: //depot/thrperl@4

1 files changed, 3 insertions, 0 deletions

diff --git a/regexec.c b/regexec.c
index 6a29d7f032..6c00651de7 100644
--- a/regexec.c
+++ b/regexec.c
@@ -89,6 +89,7 @@ CHECKPOINT
 regcppush(parenfloor)
 I32 parenfloor;
 {
+    dTHR;
     int retval = savestack_ix;
     int i = (regsize - parenfloor) * 3;
     int p;
@@ -110,6 +111,7 @@ I32 parenfloor;
 char*
 regcppop()
 {
+    dTHR;
     I32 i = SSPOPINT;
     U32 paren = 0;
     char *input;
@@ -771,6 +773,7 @@ char *prog;
 		*reglastparen = n;
 	    break;
 	case CURLYX: {
+		dTHR;	    
 		CURCUR cc;
 		CHECKPOINT cp = savestack_ix;
 		cc.oldcc = regcc;