Skip to content

Ignore JIT if a function is not compiled - #926

Merged
NWilson merged 1 commit into
PCRE2Project:mainfrom
zherczeg:utf_check
Aug 9, 2026
Merged

Ignore JIT if a function is not compiled#926
NWilson merged 1 commit into
PCRE2Project:mainfrom
zherczeg:utf_check

Conversation

@zherczeg

Copy link
Copy Markdown
Collaborator

No description provided.

@zherczeg

Copy link
Copy Markdown
Collaborator Author

I could not merge the two invalid utf code paths because of small differences. Instead, the use_jit is set to FALSE if the requested JIT function is not compiled.

@zherczeg

Copy link
Copy Markdown
Collaborator Author

Something is wrong with the code coverage public key.

@NWilson

NWilson commented Aug 8, 2026

Copy link
Copy Markdown
Member

Something is wrong with the code coverage public key.

This a problem with the codecov plugin. They fixed it, but we had to update to the latest version of the CI widget.

@NWilson NWilson left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, it looks good overall. I have some small suggestions but I don't think there are any actual bugs in here. Thanks!

Comment thread src/pcre2_match.c Outdated
Comment thread src/pcre2_match.c Outdated
(options & ~PUBLIC_JIT_MATCH_OPTIONS) == 0);
if (re->executable_jit != NULL &&
(options & ~PUBLIC_JIT_MATCH_OPTIONS) == 0)
use_jit = PRIV(jit_check_exec)(re->executable_jit, options);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could keep the old structure, if you want, and just add an && PRIV(jit_check_exec)(...) at the end. I don't mind.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just deleted the use_jit variable.

Comment thread src/pcre2_internal.h
Comment thread src/pcre2_jit_misc_inc.h Outdated
@NWilson NWilson added this to the 10.48 milestone Aug 8, 2026
@zherczeg

zherczeg commented Aug 9, 2026

Copy link
Copy Markdown
Collaborator Author

Thank you for the review! Patch is updated

Comment thread src/pcre2_jit_misc_inc.h
@NWilson

NWilson commented Aug 9, 2026

Copy link
Copy Markdown
Member

Excellent! Thanks.

@NWilson
NWilson merged commit f67db22 into PCRE2Project:main Aug 9, 2026
38 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants