[Modules] Fix the inconsistency of which Decl should be serialized for an identifier.
#10552
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
…for an identifier. (llvm#135887) Fixes the assertion failure > Assertion failed: (DeclIDs.contains(D) && "Declaration not emitted!"), function getDeclID, file ASTWriter.cpp, line 6873. We prepare to serialize a `Decl` by adding it to `DeclIDs` in `ASTWriter::GetDeclRef`. But the checks before this call aren't the same as when we are actually serializing a `Decl` in `ASTIdentifierTableTrait::EmitData` and `ASTWriter::WriteIdentifierTable`. That's how we can end up serializing a `Decl` not present in `DeclIDs` and hitting the assertion. With the assertions disabled clang crashes when trying to use a deserialized null `Decl`. Fix by making the code checks before `ASTWriter::GetDeclRef` call similar to those we have before the serialization. rdar://139319683 (cherry picked from commit ebe084f)
|
Thank you, Volodymyr! |
cyndyishida
approved these changes
Apr 25, 2025
|
@swift-ci please test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes the assertion failure
We prepare to serialize a
Declby adding it toDeclIDsinASTWriter::GetDeclRef. But the checks before this call aren't the same as when we are actually serializing aDeclinASTIdentifierTableTrait::EmitDataandASTWriter::WriteIdentifierTable. That's how we can end up serializing aDeclnot present inDeclIDsand hitting the assertion. With the assertions disabled clang crashes when trying to use a deserialized nullDecl.Fix by making the code checks before
ASTWriter::GetDeclRefcall similar to those we have before the serialization.rdar://139319683
(cherry picked from commit ebe084f)