Merge/main into next#3019
Merged
huitseeker merged 2 commits intonextfrom Apr 22, 2026
Merged
Conversation
* fix: defer debug variable registration to build() to avoid dedup crash When `ensure_block()` deduplicates a basic block (returning an existing MastNodeId with is_new=false), calling `register_debug_vars_for_node()` on the returned ID violates the CSR structure's sequential ordering requirement, causing a crash. * debuginfo: add FrameBase variant and set_value_location to DebugVarInfo * fixup: add FrameBase to serialization round-trip test * chore: fix formatting and add changelog entry * fix: include debug vars in block fingerprint to prevent incorrect dedup * refactor: keep debug vars external to builder, fix remove_nodes remap * fix: transfer debug vars during merge_basic_blocks * fix: preserve debug vars in repeat path's cloned-block dedup * fix: keep source block metadata during merge_basic_blocks * fix: transfer debug metadata during MastForest merge and compact * fix: include debug vars in merger dedup key - add coverage tests * fix: preserve metadata in MAST dedup * fix: preserve asm metadata in builder dedup * fix: preserve metadata-sensitive assembler dedup * doc: Update documentation * test: add more tests for merger * fix: first-name-wins for procedure names, exact static-link resolution * fix: skip metadata fingerprint augmentation in stripped builds * fix: import only selected alias in ensure_external_link * chore: bump rand to fix * fix: normalize padded static-link asm-op metadata for padded blocks --------- Co-authored-by: François Garillot <francois@garillot.net>
huitseeker
added
the
no changelog
bitwalker
approved these changes
Apr 21, 2026
huitseeker
force-pushed
the
merge/main-into-next
branch
2 times, most recently
from
a3bdfa6 to
4457edd
Compare
huitseeker
force-pushed
the
merge/main-into-next
branch
from
4457edd to
6f29ed7
Compare
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
3 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.
Merges #2955 back into next.