X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=regcomp.c;h=b3c31b753d7602a7bc43ce92e4a2b9f90f61c698;hb=6a28abbc8c08ff5da570415ad3f8a343b51e103d;hp=bb109fed548c462c31d801c806dc301af0a7f86e;hpb=bb263b4e883e8d326ee443c4da58aa78aea8b77b;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/regcomp.c b/regcomp.c
index bb109fe..b3c31b7 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -5758,6 +5758,7 @@ Perl_regdump(pTHX_ regexp *r)
         });
     }
 #else
+    PERL_UNUSED_CONTEXT;
     PERL_UNUSED_ARG(r);
 #endif	/* DEBUGGING */
 }
@@ -5963,6 +5964,7 @@ Perl_regprop(pTHX_ SV *sv, const regnode *o)
     else if (k == BRANCHJ && (OP(o) == UNLESSM || OP(o) == IFMATCH))
 	Perl_sv_catpvf(aTHX_ sv, "[-%d]", o->flags);
 #else
+    PERL_UNUSED_CONTEXT;
     PERL_UNUSED_ARG(sv);
     PERL_UNUSED_ARG(o);
 #endif	/* DEBUGGING */
@@ -5973,6 +5975,8 @@ Perl_re_intuit_string(pTHX_ regexp *prog)
 {				/* Assume that RE_INTUIT is set */
     dVAR;
     GET_RE_DEBUG_FLAGS_DECL;
+    PERL_UNUSED_CONTEXT;
+
     DEBUG_COMPILE_r(
 	{
 	    const char * const s = SvPV_nolen_const(prog->check_substr
@@ -6226,14 +6230,15 @@ Perl_save_re_context(pTHX)
 	if (rx) {
 	    U32 i;
 	    for (i = 1; i <= rx->nparens; i++) {
-		GV *gv;
 		char digits[TYPE_CHARS(long)];
 		const STRLEN len = my_sprintf(digits, "%lu", (long)i);
 		GV *const *const gvp
 		    = (GV**)hv_fetch(PL_defstash, digits, len, 0);
 
-		if (gvp && SvTYPE(gv = *gvp) == SVt_PVGV && GvSV(gv)) {
-		    save_scalar(gv);
+		if (gvp) {
+		    GV * const gv = *gvp;
+		    if (SvTYPE(gv) == SVt_PVGV && GvSV(gv))
+			save_scalar(gv);
 		}
 	    }
 	}