From 2649f2c19a9dc4cac2cf535de25fe7b36dee8328 Mon Sep 17 00:00:00 2001
From: Nicholas Clark <nick@ccl4.org>
Date: Tue, 15 Jun 2004 07:17:17 +0000
Subject: Assert SvTYPE is at least PGMV whenever accessing SvSTASH

p4raw-id: //depot/perl@22935
---
 ext/Storable/Storable.xs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'ext')

diff --git a/ext/Storable/Storable.xs b/ext/Storable/Storable.xs
index 2efc07ce9f..a8cd003342 100644
--- a/ext/Storable/Storable.xs
+++ b/ext/Storable/Storable.xs
@@ -4287,9 +4287,8 @@ static SV *retrieve_ref(pTHX_ stcxt_t *cxt, char *cname)
 	 */
 
 	if (cname) {
-		/* Do not use sv_upgrade to preserve STASH */
-		SvFLAGS(rv) &= ~SVTYPEMASK;
-		SvFLAGS(rv) |= SVt_RV;
+		/* No need to do anything, as rv will already be PVMG.  */
+		assert (SvTYPE(rv) >= SVt_RV);
 	} else {
 		sv_upgrade(rv, SVt_RV);
 	}
-- 
cgit v1.2.1