Skip to content

sv_upgrade: minor AV/HV new_body refactoring #19270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 24, 2021
Merged

sv_upgrade: minor AV/HV new_body refactoring #19270

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d7bd18
sv_upgrade: remove redundant AvALLOC(sv) = 0
richardleach Dec 9, 2021
35ed640
sv_upgrade: c99 compound literals to initialize xpvav/xpvhv
richardleach Dec 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions sv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1359,33 +1359,34 @@ Perl_sv_upgrade(pTHX_ SV *const sv, svtype new_type)
assert(new_type_details->arena_size);
/* This points to the start of the allocated area. */
new_body = S_new_body(aTHX_ new_type);
Zero(new_body, new_type_details->body_size, char);
new_body = ((char *)new_body) - new_type_details->offset;
/* xpvav and xpvhv have no offset, so no need to adjust new_body */
assert(!(new_type_details->offset));
#else
/* We always allocated the full length item with PURIFY. To do this
we fake things so that arena is false for all 16 types.. */
new_body = new_NOARENAZ(new_type_details);
#endif
SvANY(sv) = new_body;
if (new_type == SVt_PVAV) {
AvMAX(sv) = -1;
AvFILLp(sv) = -1;
*((XPVAV*) SvANY(sv)) = (XPVAV) {
.xmg_stash = NULL, .xmg_u = {.xmg_magic = NULL},
.xav_fill = -1, .xav_max = -1, .xav_alloc = 0
};

AvREAL_only(sv);
if (old_type_details->body_size) {
AvALLOC(sv) = 0;
} else {
/* It will have been zeroed when the new body was allocated.
Lets not write to it, in case it confuses a write-back
cache. */
}
} else {
*((XPVHV*) SvANY(sv)) = (XPVHV) {
.xmg_stash = NULL, .xmg_u = {.xmg_magic = NULL},
.xhv_keys = 0,
/* start with PERL_HASH_DEFAULT_HvMAX+1 buckets: */
.xhv_max = PERL_HASH_DEFAULT_HvMAX
};

assert(!SvOK(sv));
SvOK_off(sv);
#ifndef NODEFAULT_SHAREKEYS
HvSHAREKEYS_on(sv); /* key-sharing on by default */
#endif
/* start with PERL_HASH_DEFAULT_HvMAX+1 buckets: */
HvMAX(sv) = PERL_HASH_DEFAULT_HvMAX;
}

/* SVt_NULL isn't the only thing upgraded to AV or HV.
Expand Down