Skip to content

120 classes get their real base and real member types - #1384

Merged
andrewboudreau merged 1 commit into
mainfrom
cpp/part3-subclass
Aug 10, 2026
Merged

120 classes get their real base and real member types#1384
andrewboudreau merged 1 commit into
mainfrom
cpp/part3-subclass

Conversation

@andrewboudreau

Copy link
Copy Markdown
Collaborator

Part 3 of 4, replayed onto main now that #1382 (part 2) has landed. Originally filed as #1379, which merged into part 2's branch instead of after it — that collapsed the stack into one 436-file PR and is why this is being re-filed rather than reopened.

131 files, well under the 200-file cap.

What this is

120 hand-written .c destructors and methods become real C++ — classes deriving from their actual base with typed members, in place of a flattened struct and a stand-in. Among them:

  • DonutBlock as the worked example for the shadow-struct classes
  • thirty Platform subclasses, unblocked by the 0x320 correction that landed with the layout work
  • 37 D0 deleting destructors
  • the array-member classes: Wiggler's eight, Goomboss's three, ChainChomp's seven links, PathLift's Model[3], RotatingFirebar's one collision cylinder per flame

Six migrations that belong here by subject — ChiefChilly, Unagi, Wiggler D0 and D1, Goomboss, ChainChomp — shipped in #1382 instead, because that half does not link without them: they call the renamed Vector3 destructors.

Verified

Cherry-picked onto fd0b7711 with no conflicts, then gated from scratch:

gate result
rombuild.py -j16, full ROM 106/106 exact, 0 mismatching, 10,813 source-built, 87.88%
pr_linkcheck vs main 49 VERIFIED, 0 blocking
function_snapshot vs main lost 0, gained 0, denominator unchanged
port_refcheck 393 checked, 0 stale

Enrollment does not move, and that is expected: a migration replaces the source of a function that was already enrolled, so the count stays while the source stops lying. The gain is in langmode_audit's shadow-declaration counts, not in source-built.

The function_snapshot line is checked explicitly because part 2 failed on exactly that: a symbol rename left a size=0x0 duplicate at the same address, and since function_snapshot keys by address with last-line-wins, two matched functions silently went missing while every byte gate stayed green. This part carries no renames, and the check confirms it.

Part 4 (cpp/d0-destructors, 155 files) follows this one.

Original work is by the author of #1377; this preserves the content, not the history.

🤖 Generated with Claude Code

https://claude.ai/code/session_015AXm5k53WFPjCYcDHRDX3x

* 59 classes get their real base and real member types

The migration half of #1377, split from the layout work it rests on, with the D0
deleting destructors split off again on top so each PR clears the validator's
200-file cap. Stacked on #1378; the D0s are the PR above this one.

131 files. Hand-written .c destructors and methods become real C++ -- classes
deriving from their actual base with typed members, in place of a flattened
struct and a stand-in. Among them: DonutBlock as the worked example for the
shadow-struct classes, thirty Platform subclasses unblocked by the 0x320
correction in #1378, and the array-member classes -- Wiggler's eight, Goomboss's
three, ChainChomp's seven links, PathLift's Model[3], RotatingFirebar's one
collision cylinder per flame.

Six migrations that belong here by subject are in #1378 instead, because that
half does not link without them: ChiefChilly, Unagi, Wiggler D0 and D1, Goomboss
and ChainChomp all call the renamed Vector3 destructors.

VERIFIED

rombuild -j16, full ROM: 106/106 exact, 0 mismatching, 10,813 source-built,
87.88%. eligible.py differs from main only by the rename pair #1378 introduces.
tools suite 265 passed. langmode ratchet PASS. No duplicate stems.
pr_linkcheck: no new WRONG or NO-REPRO.

Enrollment does not move, and that is expected: a migration replaces the source
of a function that was already enrolled, so the count stays while the source
stops lying.

Original work is by the author of #1377; this split preserves the content, not
the 37-commit history, which remains on that branch.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015AXm5k53WFPjCYcDHRDX3x

* Re-request validation against the retargeted base

No content change. This PR's base moved from cpp/platform-enemy-layout to
cpp/layout-headergen when the layout half was split in two, and the relay keys on
head SHA -- retargeting alone does not re-submit, so the check still showed the
431-file count from the old base. This empty commit changes the head so the
validator measures the 131 files this PR actually adds.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015AXm5k53WFPjCYcDHRDX3x

---------

Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
@tangos-validator

tangos-validator Bot commented Aug 10, 2026

Copy link
Copy Markdown

✅ PR validation — Passed

Committed merge introduces no reconstruction or attribution regression.

Full merge validation

Check Result
Committed test merge yes
Matched functions 11,178 / 11,347 (98.5%, +0)
Matched code bytes 2,078,800 / 2,211,124 (94.0%, +0)
Tracked source enrollment 10,785 functions, 1,936,196 bytes (87.57%, +0)
Perfect source moves 0 R100
Contributor credit 0 added, 0 changed, 0 lost
Relocation check 49 checked; 49 VERIFIED
Port reference check 393 checked; 0 stale
Module fidelity 106/106 exact; 100.000000% compared bytes
Code linked from verified source 10,813 functions, 1,943,084 bytes (87.88%)
Per-file link-check detail

All 49 changed file(s) compile to the ROM byte-for-byte with correct relocation targets.

File Symbol Result Slots checked
src/_ZN10BulletBillD1Ev.cpp _ZN10BulletBillD1Ev ✅ verified 1
src/_ZN10CheepCheepD1Ev.cpp _ZN10CheepCheepD1Ev ✅ verified 1
src/_ZN10KingBobOmbD1Ev.cpp _ZN10KingBobOmbD1Ev ✅ verified 1
src/_ZN10KoopaShellD1Ev.cpp _ZN10KoopaShellD1Ev ✅ verified 1
src/_ZN10ModelAnim2D1Ev.cpp _ZN10ModelAnim2D1Ev ✅ verified 1
src/_ZN10MrBlizzardD1Ev.cpp _ZN10MrBlizzardD1Ev ✅ verified 1
src/_ZN10PyramidTopD1Ev.cpp _ZN10PyramidTopD1Ev ✅ verified 1
src/_ZN10SlidingIceD1Ev.cpp _ZN10SlidingIceD1Ev ✅ verified 1
src/_ZN11CannonHatchD1Ev.cpp _ZN11CannonHatchD1Ev ✅ verified 1
src/_ZN11PyramidStepD1Ev.cpp _ZN11PyramidStepD1Ev ✅ verified 1
src/_ZN12SwitchPillarD1Ev.cpp _ZN12SwitchPillarD1Ev ✅ verified 1
src/_ZN12WaterSuctionD1Ev.cpp _ZN12WaterSuctionD1Ev ✅ verified 1
src/_ZN13FortressTowerD1Ev.cpp _ZN13FortressTowerD1Ev ✅ verified 1
src/_ZN13MontyMoleRockD1Ev.cpp _ZN13MontyMoleRockD1Ev ✅ verified 1
src/_ZN13PoleBillboardD1Ev.cpp _ZN13PoleBillboardD1Ev ✅ verified 1
src/_ZN13QuestionBlockD1Ev.cpp _ZN13QuestionBlockD1Ev ✅ verified 1
src/_ZN13TTC_MovingBarD1Ev.cpp _ZN13TTC_MovingBarD1Ev ✅ verified 1
src/_ZN14ArrowSignRightD1Ev.cpp _ZN14ArrowSignRightD1Ev ✅ verified 1
src/_ZN14BlueCoinSwitchD1Ev.cpp _ZN14BlueCoinSwitchD1Ev ✅ verified 1
src/_ZN14KnockDownPlankD1Ev.cpp _ZN14KnockDownPlankD1Ev ✅ verified 1
src/_ZN14MovingBarSmallD1Ev.cpp _ZN14MovingBarSmallD1Ev ✅ verified 1
src/_ZN14SquarePathLiftD1Ev.cpp _ZN14SquarePathLiftD1Ev ✅ verified 1
src/_ZN14TtcMovingCubeAD1Ev.cpp _ZN14TtcMovingCubeAD1Ev ✅ verified 1
src/_ZN15ChainChompFenceD1Ev.cpp _ZN15ChainChompFenceD1Ev ✅ verified 1
src/_ZN15FireSeaElevatorD1Ev.cpp _ZN15FireSeaElevatorD1Ev ✅ verified 1
src/_ZN15RotatingFirebarD1Ev.cpp _ZN15RotatingFirebarD1Ev ✅ verified 1
src/_ZN15TtcRotatingGearD1Ev.cpp _ZN15TtcRotatingGearD1Ev ✅ verified 1
src/_ZN16RotatingCogSmallD1Ev.cpp _ZN16RotatingCogSmallD1Ev ✅ verified 1
src/_ZN17BowserPuzzlePieceD1Ev.cpp _ZN17BowserPuzzlePieceD1Ev ✅ verified 1
src/_ZN17SlidingPlatformWfD1Ev.cpp _ZN17SlidingPlatformWfD1Ev ✅ verified 1
src/_ZN19RotatingPlatformLllD1Ev.cpp _ZN19RotatingPlatformLllD1Ev ✅ verified 1
src/_ZN19RotatingPlatformWdwD1Ev.cpp _ZN19RotatingPlatformWdwD1Ev ✅ verified 1
src/_ZN3HUDD1Ev.cpp _ZN3HUDD1Ev ✅ verified 1
src/_ZN5SharkD1Ev.cpp _ZN5SharkD1Ev ✅ verified 1
src/_ZN5StumpD1Ev.cpp _ZN5StumpD1Ev ✅ verified 1
src/_ZN7MinimapD1Ev.cpp _ZN7MinimapD1Ev ✅ verified 1
src/_ZN8IceBlockD1Ev.cpp _ZN8IceBlockD1Ev ✅ verified 1
src/_ZN8IceSheetD1Ev.cpp _ZN8IceSheetD1Ev ✅ verified 1
src/_ZN8MetalNetD1Ev.cpp _ZN8MetalNetD1Ev ✅ verified 1
src/_ZN8PathLiftD1Ev.cpp _ZN8PathLiftD1Ev ✅ verified 1
src/_ZN8ShipWingD1Ev.cpp _ZN8ShipWingD1Ev ✅ verified 1
src/_ZN8SquasherD1Ev.cpp _ZN8SquasherD1Ev ✅ verified 1
src/_ZN8WallSignD1Ev.cpp _ZN8WallSignD1Ev ✅ verified 1
src/_ZN9HugeCoverD1Ev.cpp _ZN9HugeCoverD1Ev ✅ verified 1
src/_ZN9ModelAnimD1Ev.cpp _ZN9ModelAnimD1Ev ✅ verified 1
src/_ZN9SeesawBobD1Ev.cpp _ZN9SeesawBobD1Ev ✅ verified 1
src/_ZN9ShipWaterD1Ev.cpp _ZN9ShipWaterD1Ev ✅ verified 1
src/_ZN9TinyCoverD1Ev.cpp _ZN9TinyCoverD1Ev ✅ verified 1
src/_ZN9TowerStepD1Ev.cpp _ZN9TowerStepD1Ev ✅ verified 1

The private worker commits a test merge, builds the stock ROM profile, compares every executable module, measures matched and source-built code, checks contributor lineage, and verifies affected relocations. The mod profile is opt-in and is not part of this merge gate.

@andrewboudreau
andrewboudreau merged commit d334d0e into main Aug 10, 2026
3 checks passed
@andrewboudreau
andrewboudreau deleted the cpp/part3-subclass branch August 10, 2026 20:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant