diff options
| author | Karl Williamson <public@khwilliamson.com> | 2013-07-04 18:55:11 -0600 |
|---|---|---|
| committer | Karl Williamson <public@khwilliamson.com> | 2013-07-04 19:06:35 -0600 |
| commit | 49cf1d6641a6dfd301302f616e4f25595dcc65d4 (patch) | |
| tree | d1b2c3c6a1fe60ddd4c8298bd986045f213baf99 /sv.c | |
| parent | 1e3f3188c877f8581aeccab7f8ec866b7a978b8b (diff) | |
| download | perl-49cf1d6641a6dfd301302f616e4f25595dcc65d4.tar.gz | |
Revert "Create SVt_INVLIST"
This reverts commit e045dbedc7da04e20cc8cfccec8a2e3ccc62cc8b.
Blead won't compile with address sanitizer; commit
7cb47964955167736b2923b008cc8023a9b035e8 reverting an earlier commit
failed to fix that. I'm trying two more reversions to get it back
working. This is one of those
Diffstat (limited to 'sv.c')
| -rw-r--r-- | sv.c | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -881,6 +881,11 @@ static const struct body_details bodies_by_type[] = { /* HEs use this offset for their arena. */ { 0, 0, 0, SVt_NULL, FALSE, NONV, NOARENA, 0 }, + /* The bind placeholder pretends to be an RV for now. + Also it's marked as "can't upgrade" to stop anyone using it before it's + implemented. */ + { 0, 0, 0, SVt_DUMMY, TRUE, NONV, NOARENA, 0 }, + /* IVs are in the head, so the allocation size is 0. */ { 0, sizeof(IV), /* This is used to copy out the IV body. */ @@ -898,11 +903,6 @@ static const struct body_details bodies_by_type[] = { SVt_PV, FALSE, NONV, HASARENA, FIT_ARENA(0, sizeof(XPV) - STRUCT_OFFSET(XPV, xpv_cur)) }, - /* The invlist placeholder pretends to be an RV for now. - Also it's marked as "can't upgrade" to stop anyone using it before it's - implemented. */ - { 0, 0, 0, SVt_INVLIST, TRUE, NONV, NOARENA, 0 }, - { sizeof(XPVIV) - STRUCT_OFFSET(XPV, xpv_cur), copy_length(XPVIV, xiv_u) - STRUCT_OFFSET(XPV, xpv_cur), + STRUCT_OFFSET(XPV, xpv_cur), @@ -4117,7 +4117,7 @@ Perl_sv_setsv_flags(pTHX_ SV *dstr, SV* sstr, const I32 flags) } break; - /* case SVt_INVLIST: */ + /* case SVt_DUMMY: */ case SVt_PVLV: case SVt_PVGV: case SVt_PVMG: @@ -6184,7 +6184,7 @@ Perl_sv_clear(pTHX_ SV *const orig_sv) SvREFCNT_dec(SvSTASH(sv)); } switch (type) { - /* case SVt_INVLIST: */ + /* case SVt_DUMMY: */ case SVt_PVIO: if (IoIFP(sv) && IoIFP(sv) != PerlIO_stdin() && @@ -9446,7 +9446,7 @@ Perl_sv_reftype(pTHX_ const SV *const sv, const int ob) ? "GLOB" : "SCALAR"); case SVt_PVFM: return "FORMAT"; case SVt_PVIO: return "IO"; - case SVt_INVLIST: return "INVLIST"; + case SVt_DUMMY: return "DUMMY"; case SVt_REGEXP: return "REGEXP"; default: return "UNKNOWN"; } @@ -12183,7 +12183,7 @@ S_sv_dup_common(pTHX_ const SV *const sstr, CLONE_PARAMS *const param) SvANY(dstr) = new_XNV(); SvNV_set(dstr, SvNVX(sstr)); break; - /* case SVt_INVLIST: */ + /* case SVt_DUMMY: */ default: { /* These are all the types that need complex bodies allocating. */ |