This repository has been archived by the owner on Mar 30, 2021. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
There are no files selected for viewing
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -115,83 +115,91 @@ static bool IsStructurallyEquivalent(const DeclarationName Name1, | |
|
|
||
| using ContextVector = llvm::SmallVector<const DeclContext *, 4>; | ||
|
|
||
| static void GetContextsForEquivalenceCheck(ContextVector &Contexts, | ||
| const NamedDecl *ND) { | ||
| const DeclContext *Ctx = ND->getDeclContext(); | ||
|
|
||
| // For ObjC methods, look through categories and use the interface as context. | ||
| if (auto *MD = dyn_cast<ObjCMethodDecl>(ND)) | ||
| if (auto *ID = MD->getClassInterface()) | ||
| Ctx = ID; | ||
|
|
||
| // Collect named contexts. | ||
| // Function contexts are ignored, this behavior is enough for ASTImporter. | ||
This comment has been minimized.
Sorry, something went wrong. |
||
| // FIXME: Add assertion if different (non equivalent) functions are | ||
| // encountered on the paths (except the first)? | ||
| while (Ctx) { | ||
| if (isa<NamedDecl>(Ctx) && !isa<FunctionDecl>(Ctx)) | ||
This comment has been minimized.
Sorry, something went wrong. 
martong
|
||
| Contexts.push_back(Ctx); | ||
| Ctx = Ctx->getParent(); | ||
| } | ||
| } | ||
|
|
||
| static bool IsEquivalentDeclContext(StructuralEquivalenceContext &Context, | ||
| const DeclContext *DC1, | ||
| const DeclContext *DC2) { | ||
| if (const auto *Spec1 = dyn_cast<ClassTemplateSpecializationDecl>(DC1)) { | ||
| const auto *Spec2 = dyn_cast<ClassTemplateSpecializationDecl>(DC2); | ||
| if (!Spec2) | ||
| return false; | ||
| if (!IsStructurallyEquivalent(Spec1->getDeclName(), Spec2->getDeclName())) | ||
| return false; | ||
| if (!IsStructurallyEquivalent(Context, Spec1->getTemplateArgs(), | ||
| Spec2->getTemplateArgs())) | ||
| return false; | ||
| } else if (const auto *ND1 = dyn_cast<NamespaceDecl>(DC1)) { | ||
| const auto *ND2 = dyn_cast<NamespaceDecl>(DC2); | ||
| if (!ND2) | ||
| return false; | ||
| if (ND1->isAnonymousNamespace() != ND2->isAnonymousNamespace()) | ||
| return false; | ||
| if (ND1->isInline() != ND2->isInline()) | ||
| return false; | ||
| if (ND1->isAnonymousNamespace() || ND1->isInlineNamespace()) | ||
| return true; | ||
| if (!IsStructurallyEquivalent(ND1->getDeclName(), ND2->getDeclName())) | ||
| return false; | ||
| } else if (const auto *RD1 = dyn_cast<RecordDecl>(DC1)) { | ||
| const auto *RD2 = dyn_cast<RecordDecl>(DC2); | ||
| if (!RD2) | ||
| return false; | ||
| if (!IsStructurallyEquivalent(RD1->getDeclName(), RD2->getDeclName())) | ||
| return false; | ||
| } else if (const auto *ED1 = dyn_cast<EnumDecl>(DC1)) { | ||
This comment has been minimized.
Sorry, something went wrong.
martong
|
||
| const auto *ED2 = dyn_cast<EnumDecl>(DC2); | ||
| if (!ED2) | ||
| return false; | ||
| if (ED1->isScoped() != ED2->isScoped()) | ||
| return false; | ||
| } else if (const auto *ND1 = dyn_cast<NamedDecl>(DC1)) { | ||
| const auto *ND2 = cast<NamedDecl>(DC2); | ||
| if (!IsStructurallyEquivalent(ND1->getDeclName(), ND2->getDeclName())) | ||
| return false; | ||
| } else | ||
| llvm_unreachable("Context should be NamedDecl."); | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| /// This function checks for equivalent "context" (scope) of an entity. | ||
| /// This should check if the scope of two names is equivalent. | ||
| /// Functions are excluded from this scope check because there is no use case | ||
| /// when entities from different functions are compared. | ||
| static bool IsEquivalentContext(StructuralEquivalenceContext &Context, | ||
| const NamedDecl *ND1, const NamedDecl *ND2) { | ||
| ContextVector Contexts1, Contexts2; | ||
| GetContextsForEquivalenceCheck(Contexts1, ND1); | ||
| GetContextsForEquivalenceCheck(Contexts2, ND2); | ||
|
|
||
| auto DC2I = Contexts2.begin(); | ||
| for (const DeclContext *DC1 : Contexts1) { | ||
| if (DC2I == Contexts2.end()) | ||
| return false; | ||
| const DeclContext *DC2 = *DC2I; | ||
| ++DC2I; | ||
|
|
||
| if (!IsEquivalentDeclContext(Context, DC1, DC2)) | ||
| return false; | ||
| } | ||
|
|
||
| if (DC2I != Contexts2.end()) | ||
|
|
@@ -1789,10 +1797,7 @@ bool StructuralEquivalenceContext::CheckCommonEquivalence(Decl *D1, Decl *D2) { | |
| auto *ND2 = dyn_cast<NamedDecl>(D2); | ||
| if (!ND2) | ||
| return false; | ||
| if (!IsEquivalentContext(*this, ND1, ND2)) | ||
| return false; | ||
| } | ||
|
|
||
|
|
||
Perhaps we could just skip the part of the comment after the comma. Because this should be enough in the general cases too, not just for the ASTImporter.