[YARR] Reset firstCharacterAdditionalReadSize at BodyAlternativeNext reentry#61950
Merged
webkit-commit-queue merged 1 commit intoWebKit:mainfrom Apr 7, 2026
Conversation
Collaborator
|
EWS run on current version of this PR (hash 8f503ef) Details |
Constellation
approved these changes
Apr 6, 2026
…xt` reentry https://bugs.webkit.org/show_bug.cgi?id=311388 Reviewed by Yusuke Suzuki. The non-BMP first-character optimization sets firstCharacterAdditionalReadSize to 1 when tryReadUnicodeChar reads a surrogate pair, and the BodyAlternativeEnd trampoline reads it back to advance the index past the pair on the next iteration. BodyAlternativeBegin resets the register at its reentry label; BodyAlternativeNext did not. After a prior alternative read a surrogate pair, the register stayed at 1 across the alt boundary, and if the next alternative short-circuited without its own tryReadUnicodeChar call, the trampoline added the stale 1 and skipped a valid match position. Mirror the BodyAlternativeBegin reset at BodyAlternativeNext, and add the same defensive reset at the once-through BodyAlternativeEnd reentry. Test: JSTests/stress/regexp-jit-non-bmp-first-character-additional-read-size-reset.js * JSTests/stress/regexp-jit-non-bmp-first-character-additional-read-size-reset.js: Added. (shouldBe): * Source/JavaScriptCore/yarr/YarrJIT.cpp: Canonical link: https://commits.webkit.org/310677@main
8f503ef to
8c10428
Compare
Collaborator
|
Committed 310677@main (8c10428): https://commits.webkit.org/310677@main Reviewed commits have been landed. Closing PR #61950 and removing active labels. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
8c10428
8f503ef