Move generic stack operations into handle_impl.cpp (Refactor Impl construction 8/7) #6484
+529
−524
Conversation
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
danakj
force-pushed
the
less-completing-impl-as-chain-8
branch
from
ffd26af to
423c53e
Compare
danakj
force-pushed
the
less-completing-impl-as-chain-8
branch
from
423c53e to
3fbe6f1
Compare
This was referenced Dec 11, 2025
github-merge-queue bot
pushed a commit
that referenced
this pull request
Dec 17, 2025
The impl's body block has to end before we make its ImplDecl instruction, and the witness instructions come later, so they don't end up in the body block. Currently they just end up in the enclosing (file, typically, or class) scope block. Add a new InstBlockId to Impl for holding witness instructions, and explicitly insert them into that block. Then include those instructions into the scope of the Impl for naming, and format them into the Impl right after the body block. This is based on #6484
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.
Instead of burying operations to pop the generic stack in
GetOrAddImpl, we move them up to handle_impl.cpp inBuildImplDecl, which puts them at the same level as other operations on the generic stack, likeStartGenericDeclorFinishGenericDefinition.To do so, we split
GetOrAddImplinto a few pieces:FindImplIdfinds an existing Impl that matches the declaration, or returns a LookupBucketRef and whether an error was diagnosed instead.AddImpltakes a fully builtImpl, makes anImplIdfor it, and does additional steps for a newImplverifying it and applyingextend.AddImplWitnessForDeclarationconstructs theImpl's witness, which must be done between two generic steps in order to use the generic's self specific but also add the witness instruction to the generic.We group the logic to build the initial table in the definition and to complete it in the definition together in
impl.cpp. And we save a lookup into the ImplStore by passing Impl by reference toFinishImplWitness, as we now do for other similar functions inimpl.h.This is based on #6470.