remove duplicate code and an extra branch in sv_setsv() and

other hot code by making SvTHINKFIRST() think about FAKE SVs

p4raw-id: //depot/perl@3213

1 files changed, 2 insertions, 6 deletions

diff --git a/scope.c b/scope.c
index 4a2a778605..4d62ae8368 100644
--- a/scope.c
+++ b/scope.c
@@ -742,12 +742,8 @@ leave_scope(I32 base)
 	    sv = *(SV**)ptr;
 	    /* Can clear pad variable in place? */
 	    if (SvREFCNT(sv) <= 1 && !SvOBJECT(sv)) {
-		if (SvTHINKFIRST(sv)) {
-		    if (SvREADONLY(sv))
-			croak("panic: leave_scope clearsv");
-		    if (SvROK(sv))
-			sv_unref(sv);
-		}
+		if (SvTHINKFIRST(sv))
+		    sv_force_normal(sv);
 		if (SvMAGICAL(sv))
 		    mg_free(sv);