KarpelesLab / goro / 25827566004

13%

Build Type

push

github

Committed by MagicalTux

Commit Message

vm: invoke __destruct on catch-variable rebind (bug53511)

When a try/catch binds the exception to a variable that previously
held an object, PHP fires that object's destructor immediately as
the last reference drops. The VM's slot-only path skipped this because
it doesn't go through ctx.OffsetSet's IncRef/DecRef bookkeeping.

Now dispatchTryHandler captures the previous slot value, calls DecRef
on it after binding the new exception, and:
- on a clean DecRef, falls through to the catch body normally
- on a destructor that throws, jumps past every catch clause (using
  the new TryHandler.AfterCatch field) so the retry-dispatch doesn't
  match the same try again, and propagates the destructor's throw

The catch keyword's loc is also stashed on the CatchClause so the
destructor's stack trace attributes the call to the catch line, not
the throw line — PHP's expected behaviour.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

Coverage Stats

23 of 34 new or added lines in 2 files covered. (67.65%)

18 existing lines in 2 files now uncovered.

14037 of 115893 relevant lines covered (12.11%)

2456.58 hits per line