From: Father Chrysostomos <sprout@cpan.org>
Date: Sun, 1 Jan 2012 02:58:29 +0000 (-0800)
Subject: squash some code in hv.c:S_hv_delete_common
X-Git-Tag: accepted/trunk/20130322.191538~1399
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8571a3cc77b8338413df698a2f0c959b543a32e5;p=platform%2Fupstream%2Fperl.git

squash some code in hv.c:S_hv_delete_common

Changes four commits ago made this possible.
---

diff --git a/hv.c b/hv.c
index af110fc..967ca4a 100644
--- a/hv.c
+++ b/hv.c
@@ -1049,14 +1049,8 @@ S_hv_delete_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen,
 		    mro_changes = 1;
 	}
 
-	if (d_flags & G_DISCARD) {
-	    sv = HeVAL(entry);
-	    HeVAL(entry) = &PL_sv_placeholder;
-	}
-	else {
-	    sv = sv_2mortal(HeVAL(entry));
-	    HeVAL(entry) = &PL_sv_placeholder;
-	}
+	sv = d_flags & G_DISCARD ? HeVAL(entry) : sv_2mortal(HeVAL(entry));
+	HeVAL(entry) = &PL_sv_placeholder;
 	if (sv) {
 	    /* deletion of method from stash */
 	    if (isGV(sv) && isGV_with_GP(sv) && GvCVu(sv)