Merge maint-5.004 branch (5.004_04) with mainline.

p4raw-id: //depot/perl@137

1 files changed, 5 insertions, 3 deletions

diff --git a/regexec.c b/regexec.c
index 0ed2bc721d..e5d9e4de91 100644
--- a/regexec.c
+++ b/regexec.c
@@ -145,7 +145,8 @@ regcppop()
  *	0 > length [ "foobar" =~ / ( (foo) | (bar) )* /x ]->[1]
  */
 static void
-regcppartblow()
+regcppartblow(base)
+I32 base;
 {
     dTHR;
     I32 i = SSPOPINT;
@@ -163,6 +164,7 @@ regcppartblow()
 	if (paren <= *reglastparen && regendp[paren] == endp)
 	    regstartp[paren] = startp;
     }
+    assert(savestack_ix == base);
 }
 
 #define regcpblow(cp) leave_scope(cp)
@@ -667,8 +669,8 @@ char *prog;
 	if (regnarrate) {
 	    SV *prop = sv_newmortal();
 	    regprop(prop, scan);
-	    PerlIO_printf(Perl_debug_log, "%*s%2d%-8.8s\t<%.10s>\n",
-			  regindent*2, "", scan - regprogram,
+	    PerlIO_printf(Perl_debug_log, "%*s%2ld%-8.8s\t<%.10s>\n",
+			  regindent*2, "", (long)(scan - regprogram),
 			  SvPVX(prop), locinput);
 	}
 #else