Skip to content

embed.fnc: Add some [SME]PTR asserts to functions missing them #24021

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
khwilliamson wants to merge 12 commits into
base: blead
Choose a base branch
from
+42 −38
Open

embed.fnc: Add some [SME]PTR asserts to functions missing them #24021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
53fffef
embed.fnc: Add string assertions for isSCRIPTRUN
khwilliamson Sep 28, 2025
c89c433
embed.fnc: Add EPTR for pos_b2u_midway
khwilliamson Sep 28, 2025
da7130a
embed.fnc: Add string asserts for EPTR for variant_under_utf8_count
khwilliamson Sep 28, 2025
0d5ea49
embed.fnc: Add string asserts for first_symbol,need_utf8:
khwilliamson Sep 28, 2025
f0fdb4f
embed.fnc: grok_bslash_[ox]: Use EPTR_gt
khwilliamson Dec 16, 2025
59b8d50
embed.fnc: Add string assertions for grok_numeric_radix
khwilliamson Dec 16, 2025
e01fe6f
embed.fnc: Add string assertions for utf8_hop_forward...
khwilliamson Dec 16, 2025
34639f8
pp_pack.c: Add missing 'S_' to function names
khwilliamson Dec 16, 2025
608762f
embed.fnc: Change EPTR assert for regcurly to gt
khwilliamson Dec 16, 2025
f699261
embed.fnc: Change EPTR get_quantifier_value assert to gt
khwilliamson Dec 16, 2025
dcc0e25
embed.fnc: Add string assertions for debug_start_match
khwilliamson Dec 16, 2025
35da435
embed.fnc: Add string assertions for dump_exec_pos
khwilliamson Dec 16, 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
46 changes: 23 additions & 23 deletions embed.fnc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1427,8 +1427,8 @@ Adp |int |grok_number_flags \
|NULLOK UV *valuep \
|U32 flags
ARdp |bool |grok_numeric_radix \
|NN const char **sp \
|NN const char *send
|SPTR const char **sp \
|EPTRge const char *send
AMdp |UV |grok_oct |NN const char *start \
|NN STRLEN *len_p \
|NN I32 *flags \
Expand Down Expand Up @@ -3823,13 +3823,13 @@ ARTdip |U8 * |utf8_hop_back_overshoot \
|SPTR const U8 * const start \
|NULLOK SSize_t *remaining
ARTdmp |U8 * |utf8_hop_forward \
|NN const U8 *s \
|SPTR const U8 *s \
|SSize_t off \
|NN const U8 * const end
|EPTRge const U8 * const end
ARTdip |U8 * |utf8_hop_forward_overshoot \
|NN const U8 *s \
|SPTR const U8 *s \
|SSize_t off \
|NN const U8 * const end \
|EPTRge const U8 * const end \
|NULLOK SSize_t *remaining
ARTdip |U8 * |utf8_hop_overshoot \
|MPTR const U8 *s \
Expand Down Expand Up @@ -4282,8 +4282,8 @@ ep |void |Slab_to_rw |NN OPSLAB * const slab
# endif
#endif /* defined(PERL_CORE) */
#if defined(PERL_CORE) || defined(PERL_EXT)
ERXdp |bool |isSCRIPT_RUN |NN const U8 *s \
|NN const U8 *send \
ERXdp |bool |isSCRIPT_RUN |SPTR const U8 *s \
|EPTRge const U8 *send \
|const bool utf8_target
ERTXdip |bool |is_utf8_non_invariant_string \
|NN const U8 * const s \
Expand All @@ -4294,8 +4294,8 @@ Ei |STRLEN |sv_or_pv_pos_u2b \
|STRLEN pos \
|NULLOK STRLEN *lenp
ERTdi |Size_t |variant_under_utf8_count \
|NN const U8 * const s \
|NN const U8 * const e
|SPTR const U8 * const s \
|EPTRge const U8 * const e
# if !defined(HAS_MEMRCHR)
ETei |void * |my_memrchr |NN const char *s \
|const char c \
Expand Down Expand Up @@ -4534,15 +4534,15 @@ ERXp |bool |grok_bslash_c |const char source \
|NN const char **message \
|NULLOK U32 *packed_warn
ERXp |bool |grok_bslash_o |SPTR char **s \
|EPTRge const char * const send \
|EPTRgt const char * const send \
|NN UV *uv \
|NN const char **message \
|NULLOK U32 *packed_warn \
|const bool strict \
|const bool allow_UV_MAX \
|const bool utf8
ERXp |bool |grok_bslash_x |SPTR char **s \
|EPTRge const char * const send \
|EPTRgt const char * const send \
|NN UV *uv \
|NN const char **message \
|NULLOK U32 *packed_warn \
Expand Down Expand Up @@ -5298,8 +5298,8 @@ IR |bool |should_we_output_Debug_r \
#if defined(PERL_IN_PP_PACK_C)
S |int |div128 |NN SV *pnum \
|NN bool *done
ST |char |first_symbol |NN const char *pat \
|NN const char *patend
ST |char |first_symbol |SPTR const char *pat \
|EPTRge const char *patend
RS |const char *|get_num |NN const char *patptr \
|NN SSize_t *lenptr
S |const char *|group_end |SPTR const char *patptr \
Expand All @@ -5315,8 +5315,8 @@ RST |char * |my_bytes_to_utf8 \
|STRLEN len \
|NN char *dest \
|const bool needs_swap
ST |bool |need_utf8 |NN const char *pat \
|NN const char *patend
ST |bool |need_utf8 |SPTR const char *pat \
|EPTRge const char *patend
S |bool |next_symbol |NN struct tempsym *symptr
S |SV ** |pack_rec |NN SV *cat \
|NN struct tempsym *symptr \
Expand Down Expand Up @@ -5511,7 +5511,7 @@ ETi |Size_t |find_first_differing_byte_pos \
ES |U32 |get_quantifier_value \
|NN RExC_state_t *pRExC_state \
|SPTR const char *start \
|EPTRge const char *end
|EPTRgt const char *end
ES |bool |grok_bslash_N |NN RExC_state_t *pRExC_state \
|NULLOK regnode_offset *nodep \
|NULLOK UV *code_point_p \
Expand Down Expand Up @@ -5699,7 +5699,7 @@ ETXp |UV |to_fold_latin1_|const U8 c \
#endif
#if defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_TOKE_C)
ERTXp |bool |regcurly |SPTR const char *s \
|EPTRge const char *e \
|EPTRgt const char *e \
|NULLOK const char *result[5]
#endif
#if defined(PERL_IN_REGCOMP_DEBUG_C) && defined(DEBUGGING)
Expand Down Expand Up @@ -5919,12 +5919,12 @@ EWi |void |unwind_paren |NN regexp *rex \
ES |void |debug_start_match \
|NN const REGEXP *prog \
|const bool do_utf8 \
|NN const char *start \
|NN const char *end \
|SPTR const char *start \
|EPTRge const char *end \
|NN const char *blurb
ES |void |dump_exec_pos |NN const char *locinput \
ES |void |dump_exec_pos |SPTR const char *locinput \
|NN const regnode *scan \
|NN const char *loc_regeol \
|EPTRge const char *loc_regeol \
|NN const char *loc_bostr \
|NN const char *loc_reg_starttry \
|const bool do_utf8 \
Expand Down Expand Up @@ -6055,7 +6055,7 @@ S |bool |sv_2iuv_common |NN SV * const sv
S |STRLEN |sv_pos_b2u_midway \
|SPTR const U8 * const s \
|MPTR const U8 * const target \
|NN const U8 *end \
|EPTRge const U8 *end \
|STRLEN endu
S |STRLEN |sv_pos_u2b_cached \
|NN SV * const sv \
Expand Down
4 changes: 2 additions & 2 deletions pp_pack.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,7 @@ S_next_symbol(pTHX_ tempsym_t* symptr )
themselves if they need to do a lot of unpacks like this on it
*/
STATIC bool
need_utf8(const char *pat, const char *patend)
S_need_utf8(const char *pat, const char *patend)
{
bool first = TRUE;

Expand All @@ -824,7 +824,7 @@ need_utf8(const char *pat, const char *patend)
}

STATIC char
first_symbol(const char *pat, const char *patend) {
S_first_symbol(const char *pat, const char *patend) {
PERL_ARGS_ASSERT_FIRST_SYMBOL;

while (pat < patend) {
Expand Down
28 changes: 15 additions & 13 deletions proto.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions regexec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11761,6 +11761,8 @@ it are from the Inherited or Common scripts.
bool
Perl_isSCRIPT_RUN(pTHX_ const U8 * s, const U8 * send, const bool utf8_target)
{
PERL_ARGS_ASSERT_ISSCRIPT_RUN;

/* Basically, it looks at each character in the sequence to see if the
* above conditions are met; if not it fails. It uses an inversion map to
* find the enum corresponding to the script of each character. But this
Expand Down
Loading