avoid creating spurious subroutine stubs on failed subroutine

call and other places of sv_2cv() misuse; fixes problems with
failed subroutine calls "hiding" later attempts to lookup methods
in base classes

p4raw-id: //depot/perl@3388

1 files changed, 19 insertions, 13 deletions

diff --git a/pp_hot.c b/pp_hot.c
index deb4985c49..5fa2bef7b9 100644
--- a/pp_hot.c
+++ b/pp_hot.c
@@ -2094,10 +2094,13 @@ PP(pp_entersub)
 	break;
     case SVt_PVGV:
 	if (!(cv = GvCVu((GV*)sv)))
-	    cv = sv_2cv(sv, &stash, &gv, TRUE);
-	if (cv)
-	    break;
-	DIE("Not a CODE reference");
+	    cv = sv_2cv(sv, &stash, &gv, FALSE);
+	if (!cv) {
+	    ENTER;
+	    SAVETMPS;
+	    goto try_autoload;
+	}
+	break;
     }
 
     ENTER;
@@ -2117,16 +2120,19 @@ PP(pp_entersub)
 	    cv = GvCV(gv);
 	}
 	/* should call AUTOLOAD now? */
-	else if ((autogv = gv_autoload4(GvSTASH(gv), GvNAME(gv), GvNAMELEN(gv),
-				   FALSE)))
-	{
-	    cv = GvCV(autogv);
-	}
-	/* sorry */
 	else {
-	    sub_name = sv_newmortal();
-	    gv_efullname3(sub_name, gv, Nullch);
-	    DIE("Undefined subroutine &%s called", SvPVX(sub_name));
+try_autoload:
+	    if ((autogv = gv_autoload4(GvSTASH(gv), GvNAME(gv), GvNAMELEN(gv),
+				   FALSE)))
+	    {
+		cv = GvCV(autogv);
+	    }
+	    /* sorry */
+	    else {
+		sub_name = sv_newmortal();
+		gv_efullname3(sub_name, gv, Nullch);
+		DIE("Undefined subroutine &%s called", SvPVX(sub_name));
+	    }
 	}
 	if (!cv)
 	    DIE("Not a CODE reference");