From: Gerard Goossen <gerard@tty.nl>
Date: Thu, 29 Mar 2007 17:31:32 +0000 (+0200)
Subject: Re: [PATCH] MAD disable constant inlining
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=36dee510cd49a7318e0ddea31b4d74e974725f7d;p=p5sagit%2Fp5-mst-13.2.git

Re: [PATCH] MAD disable constant inlining
Message-ID: <20070329153132.GD20231@ostwald>

p4raw-id: //depot/perl@30837
---

diff --git a/toke.c b/toke.c
index d11cdcc..f8e11c9 100644
--- a/toke.c
+++ b/toke.c
@@ -5421,8 +5421,9 @@ Perl_yylex(pTHX)
 				    PL_nextwhite = 0;
 				}
 			    }
+			    else
 #endif
-			    goto its_constant;
+				goto its_constant;
 			}
 		    }
 #ifdef PERL_MAD
@@ -5469,7 +5470,7 @@ Perl_yylex(pTHX)
 				"Ambiguous use of -%s resolved as -&%s()",
 				PL_tokenbuf, PL_tokenbuf);
 		    /* Check for a constant sub */
-		    if ((sv = gv_const_sv(gv))) {
+		    if ((sv = gv_const_sv(gv)) && !PL_madskills) {
 		  its_constant:
 			SvREFCNT_dec(((SVOP*)yylval.opval)->op_sv);
 			((SVOP*)yylval.opval)->op_sv = SvREFCNT_inc_simple(sv);