From 38bd7ad824475827a398201ca9ae79a9b2b70c50 Mon Sep 17 00:00:00 2001
From: Father Chrysostomos <sprout@cpan.org>
Date: Mon, 5 Aug 2013 00:28:48 -0700
Subject: [PATCH] =?utf8?q?toke.c:incline:=20Don=E2=80=99t=20stringify=20a?=
 =?utf8?q?=20GV=20to=20look=20it=20up?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

If we already have the GV, there is no need to stringify it and then
look it up again.
---
 toke.c | 36 ++++++++----------------------------
 1 file changed, 8 insertions(+), 28 deletions(-)

diff --git a/toke.c b/toke.c
index 3689422..7033bc6 100644
--- a/toke.c
+++ b/toke.c
@@ -1760,22 +1760,8 @@ S_incline(pTHX_ const char *s)
 	     * to *{"::_<newfilename"} */
 	    /* However, the long form of evals is only turned on by the
 	       debugger - usually they're "(eval %lu)" */
-	    const char *cf = GvNAME(cfgv)+2;
-	    STRLEN tmplen = GvNAMELEN(cfgv)-2;
-	    char smallbuf[128];
-	    char *tmpbuf;
-	    GV **gvp;
-	    STRLEN tmplen2 = len;
-	    if (tmplen + 2 <= sizeof smallbuf)
-		tmpbuf = smallbuf;
-	    else
-		Newx(tmpbuf, tmplen + 2, char);
-	    tmpbuf[0] = '_';
-	    tmpbuf[1] = '<';
-	    memcpy(tmpbuf + 2, cf, tmplen);
-	    tmplen += 2;
-	    gvp = (GV**)hv_fetch(PL_defstash, tmpbuf, tmplen, FALSE);
-	    if (gvp) {
+		char smallbuf[128];
+		STRLEN tmplen2 = len;
 		char *tmpbuf2;
 		GV *gv2;
 
@@ -1784,12 +1770,8 @@ S_incline(pTHX_ const char *s)
 		else
 		    Newx(tmpbuf2, tmplen2 + 2, char);
 
-		if (tmpbuf2 != smallbuf || tmpbuf != smallbuf) {
-		    /* Either they malloc'd it, or we malloc'd it,
-		       so no prefix is present in ours.  */
-		    tmpbuf2[0] = '_';
-		    tmpbuf2[1] = '<';
-		}
+		tmpbuf2[0] = '_';
+		tmpbuf2[1] = '<';
 
 		memcpy(tmpbuf2 + 2, s, tmplen2);
 		tmplen2 += 2;
@@ -1803,11 +1785,11 @@ S_incline(pTHX_ const char *s)
 		       alias the saved lines that are in the array.
 		       Otherwise alias the whole array. */
 		    if (CopLINE(PL_curcop) == line_num) {
-			GvHV(gv2) = MUTABLE_HV(SvREFCNT_inc(GvHV(*gvp)));
-			GvAV(gv2) = MUTABLE_AV(SvREFCNT_inc(GvAV(*gvp)));
+			GvHV(gv2) = MUTABLE_HV(SvREFCNT_inc(GvHV(cfgv)));
+			GvAV(gv2) = MUTABLE_AV(SvREFCNT_inc(GvAV(cfgv)));
 		    }
-		    else if (GvAV(*gvp)) {
-			AV * const av = GvAV(*gvp);
+		    else if (GvAV(cfgv)) {
+			AV * const av = GvAV(cfgv);
 			const I32 start = CopLINE(PL_curcop)+1;
 			I32 items = AvFILLp(av) - start;
 			if (items > 0) {
@@ -1821,8 +1803,6 @@ S_incline(pTHX_ const char *s)
 		}
 
 		if (tmpbuf2 != smallbuf) Safefree(tmpbuf2);
-	    }
-	    if (tmpbuf != smallbuf) Safefree(tmpbuf);
 	}
 	CopFILE_free(PL_curcop);
 	CopFILE_setn(PL_curcop, s, len);
-- 
2.7.4