Change 30703 by [EMAIL PROTECTED] on 2007/03/22 23:14:35

        Integrate:
        [ 30345]
        newHV doesn't need to turn off POK or NOK, as they will default to not
        being set.
        
        [ 30659]
        Don't try to set the NV on a typeglob-in-action. Should cure bug
        41920.

Affected files ...

... //depot/maint-5.8/perl/hv.c#114 integrate
... //depot/maint-5.8/perl/sv.c#349 integrate

Differences ...

==== //depot/maint-5.8/perl/hv.c#114 (text) ====
Index: perl/hv.c
--- perl/hv.c#113~30668~        2007-03-21 12:29:38.000000000 -0700
+++ perl/hv.c   2007-03-22 16:14:35.000000000 -0700
@@ -1322,8 +1322,6 @@
     register XPVHV* xhv;
     HV * const hv = (HV*)newSV_type(SVt_PVHV);
     xhv = (XPVHV*)SvANY(hv);
-    SvPOK_off(hv);
-    SvNOK_off(hv);
 #ifndef NODEFAULT_SHAREKEYS
     HvSHAREKEYS_on(hv);         /* key-sharing on by default */
 #endif

==== //depot/maint-5.8/perl/sv.c#349 (text) ====
Index: perl/sv.c
--- perl/sv.c#348~30692~        2007-03-22 10:55:41.000000000 -0700
+++ perl/sv.c   2007-03-22 16:14:35.000000000 -0700
@@ -1314,7 +1314,8 @@
         * NV slot, but the new one does, then we need to initialise the
         * freshly created NV slot with whatever the correct bit pattern is
         * for 0.0  */
-       if (old_type_details->zero_nv && !bodies_by_type[new_type].zero_nv)
+       if (old_type_details->zero_nv && !new_type_details->zero_nv
+           && !isGV_with_GP(sv))
            SvNV_set(sv, 0);
 #endif
 
End of Patch.

Reply via email to