Repository navigation
merge: cascade 8.4 into 8.5 (conflicts resolved) - #288
Merged
Merged
Conversation
…lias and accept method donors redefine() now takes `\Closure|FunctionLikeInterface $newBody` and an optional `?string $preserveAs`: - a user method of another class (the donor) can be adopted as the new body in place, exactly like a closure body; the entry keeps its identity (name, scope, prototype, visibility, static/final flags) while the compiled body, signature, attributes and doc comment follow the donor; - with `preserveAs` the previous body is published before the swap as a private method of the declaring class (ZEND_ACC_CHANGED when an ancestor declares a private method of that name, shared into subclasses that were linked before) or as a second global function, so it stays callable and can be swapped back in with a later redefine(). ReflectionClass::addMethod() accepts a method donor as well and publishes an override of an inherited method with the engine's inheritance rules (prototype kept, no final override, no visibility narrowing, same static-ness, parent-private redeclaration marked CHANGED); the class's magic slots and the method tables of subclasses linked before follow the override. FunctionBodySwap allocates the fresh run-time cache of a swapped or published entry from request memory WITHOUT ZEND_ACC_HEAP_RT_CACHE and releases it on the next swap of the entry: a heap-flagged cache shared by a parent and a subclass method table was efree()d once per table at a destructor-path shutdown (USE_ZEND_ALLOC=0), i.e. for every subclass linked after a swap. The donor signature check renders `self` and `parent` resolved against each side's own scope (declaring class, or the bound scope of a closure donor): PHP 8.4 reflection reports the keywords verbatim, so a method donor spelling the target class is compared by what its types accept. PHP 8.4 specifics of this port: the statics-ownership bookkeeping of this branch stays in place next to the run-time cache records - a closure donor owns its statics defaults table, so the swap duplicates it (duplicateStatics: true), while a method donor's table lives as long as the body the entry now holds a reference on (duplicateStatics: false, the same rule as for published overrides); PendingBodySwap and releaseSwappedInBody() carry both records. New RedefinitionException (named factories) and SharedMemoryException::sharedEntryHasLinkedSubclasses(); docs/hot-swap.md documents method donors, preserveAs, the addMethod() override and the run-time cache rule. (cherry picked from commits 5471958, 67e183b and 91a170c of feature/redefine-preserve-alias) Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01VLQcsvgdQUzwBFsoKUAcG2
PHPStan 2.3 folds more constants through loops and casts: the nested iteration count of the get-iterator scenario and the property snapshot of the resolution-handlers test read as constant on the first iteration, which made their guards look always-true and the loops look endless, and an ArrayObject built without a type reads as holding nothing. - the scenario compares the nested iteration count with the item count of the iterated instance instead of a literal; - the resolution-handlers test asserts the snapshot with assertSame() instead of a guard ending the loop with fail(); - the error-callback test declares the element type of its log. No behaviour of the tests changes. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01VLQcsvgdQUzwBFsoKUAcG2 (cherry picked from commit 4c0316e)
…ase what the swap owns An in-place body swap and the publications built on it (the preserveAs alias, the addMethod() override) copied the entry structure where the engine also copies it, and freed or shared what those copies still used: - the run-time cache minted for an entry was freed by its next swap while a fake closure made over the entry (Closure::fromCallable, a first-class callable, ReflectionMethod::getClosure) or the engine clone a subclass implementing an interface holds still read it (use-after-free). The release now finds those copies first: a live frame on the block keeps it, a fake closure gets a private heap copy the engine frees with it, a clone gets a fresh minted cache (ObjectStore::instancesOf walks EG(objects_store) without letting its own handles alias the slots it reads); - on 8.4 an alias or override adopting a body whose statics defaults were minted by a swap, and a method donor carrying such a table or a closure's own table (a method published from a closure), shared it and had it freed from under them; the adopter now duplicates it like a closure donor's, the container release returns the duplicate, and the previous record is read before the new swap overwrites it, so the eager release of a minted table matches again instead of leaking one table per swap; - the materialized live statics of a preserved body were orphaned: the alias now takes them over (the preserved body keeps its state), a swap destroys the previous body's table unless a fake closure or a clone borrowed it, and removeMethods() releases the live statics, the minted duplicate and the minted cache of an entry it unpublishes from the only table holding it; - the alias reached only subclasses sharing the entry pointer: every subclass linked before receives it now (a subclass declaring the name itself is marked ZEND_ACC_CHANGED), the shared-memory guard refuses any linked subclass, and an override carries ZEND_ACC_CHANGED whenever the inherited method does, as the engine propagates it; - engine clones of an inherited entry (subclass implementing an interface that declares the method) follow a redefinition in place and are replaced by an override like pointer-sharing buckets. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01VLQcsvgdQUzwBFsoKUAcG2
…at preserveAs keeps Fake closures and interface clones of a swapped entry, the live statics a preserved alias takes over, the subclasses an alias reaches, the CHANGED propagation of overrides, the per-adopter statics duplicates on 8.4 and the resources removeMethods() releases - as implemented by ed9548b. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01VLQcsvgdQUzwBFsoKUAcG2
…s, clones and live frames Fake closures of every kind made over a redefined method or function keep executing the previous body on a private heap copy of the block the next swap retires, an interface clone of a subclass linked after a swap follows the next swap with a minted cache of its own, a fake closure redefining its own method mid-flight keeps the block it runs on, a hundred swaps next to a live fake closure stay memory-flat, and a fake closure over a preserved alias survives a redefinition of the alias. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01VLQcsvgdQUzwBFsoKUAcG2
Same shape as on the 8.5 branch, where a closure donor's bound variables stay with the closure object and the swapped-in body would read them unbound. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01VLQcsvgdQUzwBFsoKUAcG2
…nts on 8.4 Every adopter of a body carrying a minted defaults table - the preserving alias, an addMethod() override, an entry taking it as a method donor - mints a duplicate of its own and keeps it when the source entry's next swap releases the source's, the alias continues on the live statics it took over while a never-called alias starts from its duplicate of the defaults, and consecutive closure-donor swaps of a function and of a method stay memory-flat (the previous duplicate used to leak once per swap). Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01VLQcsvgdQUzwBFsoKUAcG2
…lass An alias reaches the subclasses linked before that override the redefined method (the preserved body runs on their instances through parent::), a subclass declaring a private method of the alias name keeps it and gets ZEND_ACC_CHANGED so the base scope still resolves the base alias, the shared-memory guard refuses both shapes when the base is immutable, and subclasses linked after inherit the alias the engine's way - with one body share per publishing table. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01VLQcsvgdQUzwBFsoKUAcG2
…nd removeMethods() releases The alias of a method or function continues on the very live statics table the preserved body had materialized while the new body starts afresh, removing the alias destroys that table and releases the minted run-time cache the bucket destructor cannot reach, publish/call/restore/remove cycles stay within the container baseline, a table a fake closure borrows survives both a swap and the removal, and an alias still published by a subclass table keeps its statics until the last table drops it. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01VLQcsvgdQUzwBFsoKUAcG2
…y flags A method entry that adopted a body from an opcache-cached donor carries ZEND_ACC_IMMUTABLE as a body-level flag. An interface-induced engine clone copied from such an entry, or a subclass method redeclaring an alias, then looked immutable although its class lives in request memory, so redefine() skipped the clone (the subclass kept the previous body) and markRedeclaration() refused a perfectly writable class. Decide by the holder class: a clone inside a mutable class follows the swap, a redeclaring mutable subclass receives ZEND_ACC_CHANGED, and only a shared-memory class is refused. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01VLQcsvgdQUzwBFsoKUAcG2
…verrides An override installed over an inherited method must keep the engine's inheritance semantics: it carries ZEND_ACC_CHANGED when the inherited method was CHANGED or private (so an ancestor's private method still wins from the ancestor's own scope), takes the inherited prototype otherwise, and a fresh method gets neither. Covers: a three-level chain whose leaf overrides a CHANGED method and a subclass linked afterwards, an early-linked subclass tree, a private ancestor method shadowed by an override, and a plain override that must not acquire the flag. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01VLQcsvgdQUzwBFsoKUAcG2
…d entry A subclass that implements an interface declaring an inherited method holds an engine clone of the entry rather than the entry pointer. The clone must follow redefine() in place, carry a preserveAs alias, be reachable by an addMethod() override through the clone-holding descendants, keep its own run-time cache after the swap, and be refused only when its class lives in shared memory. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01VLQcsvgdQUzwBFsoKUAcG2
On PHP 8.4 a method installed from a closure keeps its live statics slot pointing at its defaults table. Taking that method as a donor must give the entry its own duplicate, so the two methods count independently, the donor can be removed under a live entry, and a plain method donor still shares. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01VLQcsvgdQUzwBFsoKUAcG2
…arios of the fixes The matrix script runs under both allocators and both opcache modes and shuts the process down through the destructor path, which is where the fixed defects used to crash. Five scenarios are added: fake closures over a redefined method surviving its next redefinition, an interface clone linked between two redefinitions following the second, a closure donor with statics preserved under an alias and swapped back before the alias is removed, an addMethod() override under a redeclared ancestor-private method carrying ZEND_ACC_CHANGED, and an overriding subclass linked before a preserving redefine (refused on a shared-memory entry, served through parent:: otherwise). Every scenario also pins the engine state it relies on by pointer identity and flag bits, and the hot loop drives the new entries. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01VLQcsvgdQUzwBFsoKUAcG2
… question A body swap used to walk the whole class table for every question it asked about its entry (its published shares, its clones, the shares of each clone, and again at each commit for the cache release and the statics checks) and the object store once per check, building a reflection wrapper per visited class: about 190 ms per redefine() in a process holding 1,800 classes, with the swap tests pacing their plateau loops around it. EntryPublications takes one survey per redefinition - the buckets named like the entry, read through an integer view of the class table (HashTable::pointerValueAddresses(), the technique ObjectStore already uses) with one method lookup per class and no wrapper until a class actually publishes the name - and answers every question of the entry swap, the clone swaps and their commits from memory. A commit gathers the live closures once and takes every decision that reads them before anything is destroyed. The survey keeps addresses only, so the object-store walk does not pay for its own bookkeeping. MethodPublisher reaches the linked subclasses through ReflectionClass::getLinkedSubclasses(), the same walk with a parent-chain check instead of a wrapper per class. Each clone is listed once, with the class the engine separated it for (found by ancestry: table order lies after delayed early binding), so a redefinition swaps a clone shared into a grand-subclass once instead of once per table publishing it. Same 1,800-class process: a redefine() takes 7 ms with 1,500 subclasses sharing the entry and 2-3 ms among unrelated classes; the default suite runs in 24 s instead of 67 s. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01VLQcsvgdQUzwBFsoKUAcG2
…as-8.4 feat(reflection): preserve the previous body of redefine() under an alias and accept method donors (PHP 8.4)
Resolves the conflicts of the automated cascade (#287) in favour of the 8.5 implementation: #282 is the 8.5 resolution of the feature #284 brought to 8.4 (redefine() with preserveAs, method donors, addMethod() overrides, the review fixes and the one-survey-per-swap performance work), so FunctionBodySwap, PendingBodySwap, FunctionLikeTrait, MethodPublisher, ClassDelta, the hot-swap docs and the alias matrix keep their 8.5 shape. The statics-defaults duplicates PHP 8.4 mints (and the tests pinning them, RedefineMintedStaticsTest and RedefineClosureBackedDonorTest with their stubs) do not apply to PHP 8.5, where the defaults table is guarded by the body refcount, and are not carried over. The resulting tree is identical to 8.5; the commit records the cascade. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01VLQcsvgdQUzwBFsoKUAcG2
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
2 participants
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.
What this changes
The resolved form of the automated cascade #287 (
8.4→8.5), which conflicts in seven files because #284 (the PHP 8.4 port) and #282 (the PHP 8.5 original) brought the same feature to each branch with one deliberate difference: the statics-defaults duplicates PHP 8.4 mints for closure-backed bodies, which PHP 8.5 does not need (its defaults table is guarded by the body refcount).Resolution, per the branch model in
AGENTS.md(fixes land on the minimum affected branch and cascade upward; the successor keeps its own engine model):src/Reflection/FunctionBodySwap.php,PendingBodySwap.php,FunctionLikeTrait.php,MethodPublisher.php,src/HotSwap/ClassDelta.php,docs/hot-swap.mdandtests/HotSwap/scripts/redefine-alias-matrix.phpkeep their8.5shape (feat(reflection): preserve the previous body of redefine() under an alias and accept method donors #282 already carries the review fixes and the one-survey-per-swap performance work in the 8.5 model).RedefineMintedStaticsTest,RedefineClosureBackedDonorTestand theirMinted*/ClosureDonor*stubs) are not carried over: they pin behaviour that does not exist on PHP 8.5.8.4was already merged through merge: cascade 8.4 into 8.5 #286.The resulting tree is byte-identical to
8.5; the merge commit records that8.4is fully cascaded, so #287 shows nothing left to merge once this lands and the8.5→mastercascade (#285, clean) picks it up.Suggested order: merge this PR, close #287, then merge #285.
Environment it was verified on
php -v): PHP 8.5.11 (cli) (built: Sep 24 2026 13:49:29) (NTS)--enable-debug)? noThe tree equals
8.5at de60a32, whose CI is green.Checklist
master= newestsupported minor,
8.4= PHP 8.4, …) — fixes cascade upward, neverdownward (this is the cascade step itself)
composer testpasses on the matching PHP minor (unchanged tree)composer phpstan(level max) andcomposer cs:checkare green (unchanged tree)layout_structsintools/generator/symbols.php(nothing new)tools/generator/symbols.phpchanged: regenerated withcomposer gen-headersand committed the result — nothing underinclude/,stubs/or.phpstorm.meta.phpwas hand-edited (unchanged)🤖 Generated with Claude Code
https://claude.ai/code/session_01VLQcsvgdQUzwBFsoKUAcG2
Generated by Claude Code