php-in-php: lazy LastErrorRuntime from ensureMinimal (#34631) - #34633
Merged
PurHur merged 1 commit intoAug 25, 2026
Conversation
Drop always-on LastError NestedJIT from thin AOT user-script init; call sites
already ensureLinked. Restore builder insert mid-{main} (peer #34621).
Co-authored-by: Cursor <cursoragent@cursor.com>
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
1 participant
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
LastErrorRuntimefromContext::ensureMinimalUserStandaloneBodies(peer php-in-php: drop Context ensureMinimalUserStandaloneBodies always-on JitReturnPending — lazy at try/finally (peer #34612) #34621).JitErrorGetLast/JitTriggerErrorKernelalreadyensureLinkedlazily (StringTriggerErroralways-on still pulls LastError when trigger_error is linked).LastErrorRuntime::implementcaptures/restores builder insert (was alwaysclearInsertionPosition) so mid-{main}ensure is safe.ContextMinimalStandaloneLazyLastErrorRuntimeShrinkTest; update peer shrink tests.runtime/*.c.Closes #34631
Test plan
./script/phpunit.sh --filter 'ContextMinimalStandaloneLazyLastError|ContextMinimalStandaloneLazyReturnPending|ContextMinimalStandaloneLazyHtmlErrorHandler|ContextMinimalStandaloneLazyDomGcProgressAssert|LastErrorRuntimeShrink|TypeDeadTypeInitializeLazyAssertLastError|ExamplesHelloWorldAotRegression'→ OK (24 tests)./script/aot-smoke.sh→ 8 passed, 0 failed./script/docker-exec.sh -- bash -lc 'script/cold-build-check.sh'→ ok (4s)trigger_error+error_get_last/error_clear_lastmatches Zend (512|boom/NULL)php-src:
ext/standard/basic_functions.c(error_get_last/error_clear_last)Lane: php-runtime-migration — #32122 / #31968 children closed; C floor empty; continued ensureMinimal shrink.
Made with Cursor