AOT: fix mb_trim NestedJIT rtrim wrong output (leftover #34396) - #34532
Merged
Merged
Conversation
MbTrimJitHelper used substr() and index-subtraction patterns that thin AOT miscompiles; rewrite rtrim with byte indexing, copyPrefix, and C2-hold NBSP deferral so runtime haystack trim matches VM/Zend. Co-authored-by: Cursor <cursoragent@cursor.com>
4 tasks
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.
Summary
MbTrimJitHelperAOT wrong output for runtime haystackmb_trim/mb_ltrim/mb_rtrim(leftover of AOT: mb_trim NestedJIT for runtime strings (#34379) #34388/AOT: fix mb_trim NestedJIT ABI (SIGSEGV/empty) leftover of #34388 #34396).\substr($s,$i,1)with byte indexing ($value[$i]) andcopyPrefix()loop — NestedJIT substr mis-fires under thin AOT.$last = $i - 1/$last === $n - 1— those icmp/sub patterns miscompile the whole loop under AOT.Repro (before)
Verification
php-src reference
ext/mbstring/mbstring.c—PHP_FUNCTION(mb_trim)/ default charset tableCloses #34379
Made with Cursor