Fix DECLARE_TRAIT MCJIT segfault — defer to VM lowering (#6284)#7046
Merged
Conversation
Empty trait compilation units segfaulted bin/jit.php -l because MCJIT link ran before DECLARE_TRAIT lowering was stable. Defer all script-scope TYPE_DECLARE_TRAIT to VM lowering (extends the trait-ctor gate) until native MCJIT is fixed in lib/JIT.php. 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
Block::containsDeclareTraitOpcodesInScriptScope()and wire it intorequiresVmLowering()so any compilation unit containingTYPE_DECLARE_TRAITskips MCJIT link/execute (exit 139) until native lowering is stable (Language: __TRAIT__ scope semantics — empty outside trait body (Zend zend_compile.c parity) #3609).test/repro/trait_empty_mcjit_probe.phpandTraitEmptyMcjitCompileTest(@group llvm).This extends the existing trait-
__constructdeferral gate to all trait declarations, fixingbin/jit.php -lon empty traits without touchingruntime/*.c.Remaining (follow-up for native MCJIT)
containsTraitConstructorOpcodes()(redundant but harmless).TraitConstructorJitExecuteTeststays skipped untillib/JIT/DECLARE_TRAIT MCJIT link is fixed.Verification
Output:
Closes #6284
Made with Cursor