Skip to content

Replace some sv_2mortal() instances with more direct equivalents #23153

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 5 commits into from
Mar 31, 2025
Merged

Replace some sv_2mortal() instances with more direct equivalents #23153

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
43cb571
Use newSVpvn_flags() rather than sv_2mortal(newSVpvn_utf8)
richardleach Mar 12, 2025
18c083d
do_readline: create new mortal with less branching
richardleach Mar 12, 2025
d1f6ac0
pp_system: use newSVtype_mortal instead of two functions
richardleach Mar 12, 2025
6cd3cbd
regcomp.c - create mortal HV/AV in one step
richardleach Mar 12, 2025
981d0f7
Perl_hv_common: sv_2mortal(newSVsv()) to sv_mortalcopy_flags()
richardleach Mar 24, 2025
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
6 changes: 3 additions & 3 deletions class.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ static void S_ensure_module_version(pTHX_ SV *module, SV *version)
static void S_split_attr_nameval(pTHX_ SV *sv, SV **namp, SV **valp)
{
STRLEN svlen = SvCUR(sv);
bool do_utf8 = SvUTF8(sv);
U32 do_utf8 = SvUTF8(sv) ? SVf_UTF8 : 0;

const char *paren_at = (const char *)memchr(SvPVX(sv), '(', svlen);
if(paren_at) {
Expand All @@ -486,7 +486,7 @@ static void S_split_attr_nameval(pTHX_ SV *sv, SV **namp, SV **valp)
*/
/* diag_listed_as: SKIPME */
croak("Malformed attribute string");
*namp = sv_2mortal(newSVpvn_utf8(SvPVX(sv), namelen, do_utf8));
*namp = newSVpvn_flags(SvPVX(sv), namelen, SVs_TEMP|do_utf8);

const char *value_at = paren_at + 1;
const char *value_max = SvPVX(sv) + svlen - 2;
Expand All @@ -500,7 +500,7 @@ static void S_split_attr_nameval(pTHX_ SV *sv, SV **namp, SV **valp)
value_max -= 1;

if(value_max >= value_at)
*valp = sv_2mortal(newSVpvn_utf8(value_at, value_max - value_at + 1, do_utf8));
*valp = newSVpvn_flags(value_at, value_max - value_at + 1, SVs_TEMP|do_utf8);
else
*valp = NULL;
}
Expand Down
6 changes: 3 additions & 3 deletions hv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,11 +648,11 @@ Perl_hv_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen,

if (keysv || is_utf8) {
if (!keysv) {
keysv = newSVpvn_utf8(key, klen, TRUE);
keysv = newSVpvn_flags(key, klen, SVf_UTF8|SVs_TEMP);
} else {
keysv = newSVsv(keysv);
keysv = sv_2mortal(newSVsv(keysv));
}
mg_copy(MUTABLE_SV(hv), sv, (char *)sv_2mortal(keysv), HEf_SVKEY);
mg_copy(MUTABLE_SV(hv), sv, (char *)keysv, HEf_SVKEY);
} else {
mg_copy(MUTABLE_SV(hv), sv, key, klen);
}
Expand Down