Skip to content

op.c auto-use attributes.pm; newSVpvs("attributes") -> newSVpvs_share() #23424

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

Open
wants to merge 1 commit into
base: blead
Choose a base branch
from
Open

op.c auto-use attributes.pm; newSVpvs("attributes") -> newSVpvs_share() #23424

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 15 additions & 7 deletions op.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3888,7 +3888,7 @@ S_apply_attrs(pTHX_ HV *stash, SV *target, OP *attrs)

Perl_load_module(
aTHX_ PERL_LOADMOD_IMPORT_OPS,
newSVpvs(ATTRSMODULE),
newSVpvs_share(ATTRSMODULE),
NULL,
op_prepend_elem(OP_LIST,
newSVOP(OP_CONST, 0, stashsv),
Expand All @@ -3903,7 +3903,7 @@ STATIC void
S_apply_attrs_my(pTHX_ HV *stash, OP *target, OP *attrs, OP **imopsp)
{
OP *pack, *imop, *arg;
SV *meth, *stashsv, **svp;
SV *meth, *stashsv, *attrpkg, **svp;

PERL_ARGS_ASSERT_APPLY_ATTRS_MY;

Expand All @@ -3914,17 +3914,25 @@ S_apply_attrs_my(pTHX_ HV *stash, OP *target, OP *attrs, OP **imopsp)
target->op_type == OP_PADHV ||
target->op_type == OP_PADAV);

attrpkg = newSVpvs_share(ATTRSMODULE);
/* no sv_2mortal() or its freed by time of leave_scope() -> replace_sv() */
SAVEFREESV(attrpkg);

/* Ensure that attributes.pm is loaded. */
/* Don't force the C<use> if we don't need it. */
svp = hv_fetchs(GvHVn(PL_incgv), ATTRSMODULE_PM, FALSE);
if (svp && *svp != &PL_sv_undef)
NOOP; /* already in %INC */
else
Perl_load_module(aTHX_ PERL_LOADMOD_NOIMPORT,
newSVpvs(ATTRSMODULE), NULL);
else {
/* Can't use 1 SV* head with 2 refcounts for attrpkg.
Perl_load_module()'s callee will modify the buf with sv_catpvs(".pm"). */
SV * sv = newSVhek(SvSHARED_HEK_FROM_PV(SvPVX(attrpkg)));
Perl_load_module(aTHX_ PERL_LOADMOD_NOIMPORT, sv, NULL);
}

/* Need package name for method call. */
pack = newSVOP(OP_CONST, 0, newSVpvs(ATTRSMODULE));
SvREFCNT_inc_simple_void_NN(attrpkg);
pack = newSVOP(OP_CONST, 0, attrpkg);

/* Build up the real arg-list. */
stashsv = newSVhek(HvNAME_HEK(stash));
Expand Down Expand Up @@ -3989,7 +3997,7 @@ Perl_apply_attrs_string(pTHX_ const char *stashpv, CV *cv,
}

Perl_load_module(aTHX_ PERL_LOADMOD_IMPORT_OPS,
newSVpvs(ATTRSMODULE),
newSVpvs_share(ATTRSMODULE),
NULL, op_prepend_elem(OP_LIST,
newSVOP(OP_CONST, 0, newSVpv(stashpv,0)),
op_prepend_elem(OP_LIST,
Expand Down
Loading