diff options
| author | Dave Mitchell <davem@fdisolutions.com> | 2008-12-05 23:08:58 +0000 |
|---|---|---|
| committer | Dave Mitchell <davem@fdisolutions.com> | 2008-12-05 23:08:58 +0000 |
| commit | 5b7362ac99593c3e25d23881adb206374991b059 (patch) | |
| tree | e622c3ba37022efcd72c6618f5a16978c7a80af8 /sv.h | |
| parent | d72ded7e206e716e080654a0bfb0666823f4da06 (diff) | |
| download | perl-5b7362ac99593c3e25d23881adb206374991b059.tar.gz | |
Integrate:
[ 34132]
Test that formats can be dumped.
[ 34133]
PVFMs don't need to access the IVX any more. (as of change 32836, which
re-implemented SvOOK() to avoid using it)
[ 34167]
You can't (and shouldn't) use CvDEPTH on a PVFM.
[ 35022]
in Dump output, PV field of format may or not be displayed in 5.10.0
[ 35023]
whether DEPTH gets dumped in formats varies within 5.10.0
p4raw-link: @35023 on //depot/perl: c12100a4ed3b3e95d0575985eb4996cefd3a2ee5
p4raw-link: @35022 on //depot/perl: 251a4af1a6b9bdceab1c562d9a6bf0544b2bcbe0
p4raw-link: @34167 on //depot/perl: 5129b2ca8d01c31a5ccad56604afff370ba7562e
p4raw-link: @34133 on //depot/perl: 30ec677dd4d12a9c099bac3f654b308d387386e9
p4raw-link: @34132 on //depot/perl: bfe27a58755fd70d150ce6080e7cfdd2f87f2358
p4raw-id: //depot/maint-5.10/perl@35024
p4raw-integrated: from //depot/perl@35022 'ignore'
ext/Devel/Peek/t/Peek.t (@34167..)
p4raw-integrated: from //depot/perl@34167 'edit in' dump.c (@34133..)
'merge in' cv.h (@34030..)
p4raw-integrated: from //depot/perl@34133 'merge in' sv.h (@34038..)
Diffstat (limited to 'sv.h')
| -rw-r--r-- | sv.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -1276,6 +1276,7 @@ the scalar's value cannot change unless written to. assert(SvTYPE(_svivx) != SVt_PVAV); \ assert(SvTYPE(_svivx) != SVt_PVHV); \ assert(SvTYPE(_svivx) != SVt_PVCV); \ + assert(SvTYPE(_svivx) != SVt_PVFM); \ assert(!isGV_with_GP(_svivx)); \ &(((XPVIV*) SvANY(_svivx))->xiv_iv); \ })) @@ -1285,6 +1286,7 @@ the scalar's value cannot change unless written to. assert(SvTYPE(_svuvx) != SVt_PVAV); \ assert(SvTYPE(_svuvx) != SVt_PVHV); \ assert(SvTYPE(_svuvx) != SVt_PVCV); \ + assert(SvTYPE(_svuvx) != SVt_PVFM); \ assert(!isGV_with_GP(_svuvx)); \ &(((XPVUV*) SvANY(_svuvx))->xuv_uv); \ })) |