Start merge with maint-5.004 branch by creating an ancestral

branch point via a fake resolution with the maint-merge branch.
See Perforce Tech Note 9 for details.

p4raw-id: //depot/perl@77

1 files changed, 1 insertions, 12 deletions

diff --git a/sv.c b/sv.c
index 1c58c46aaa..cd55f817e6 100644
--- a/sv.c
+++ b/sv.c
@@ -4043,10 +4043,9 @@ I32 n;
 }
 
 SV*
-sv_bless3(sv,stash,zaptilde)
+sv_bless(sv,stash)
 SV* sv;
 HV* stash;
-bool zaptilde;
 {
     dTHR;
     SV *ref;
@@ -4059,8 +4058,6 @@ bool zaptilde;
 	if (SvOBJECT(ref)) {
 	    if (SvTYPE(ref) != SVt_PVIO)
 		--sv_objcount;
-	    if (zaptilde && SvRMAGICAL(ref))
-		sv_unmagic(ref, '~');	/* stop cross-class pointer forgery */
 	    SvREFCNT_dec(SvSTASH(ref));
 	}
     }
@@ -4080,14 +4077,6 @@ bool zaptilde;
     return sv;
 }
 
-SV*
-sv_bless(sv,stash)
-SV* sv;
-HV* stash;
-{
-    return sv_bless3(sv, stash, FALSE);
-}
-
 static void
 sv_unglob(sv)
 SV* sv;