Only those InterestingDecls that got added to the AST should be passed to the ASTConsumer.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@165001 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/clang/Serialization/ASTReader.h b/include/clang/Serialization/ASTReader.h
index e87c93f..a3abce1 100644
--- a/include/clang/Serialization/ASTReader.h
+++ b/include/clang/Serialization/ASTReader.h
@@ -687,6 +687,12 @@
/// Objective-C protocols.
std::deque<Decl *> InterestingDecls;
+ /// \brief Redecls that have been added to the AST
+ ///
+ /// Redecls that are deserialized but not in RedeclsAddedToAST must
+ /// not be passed to the ASTConsumers, even if they are InterestignDecls.
+ llvm::SmallPtrSet<Decl *, 16> RedeclsAddedToAST;
+
/// \brief The set of redeclarable declarations that have been deserialized
/// since the last time the declaration chains were linked.
llvm::SmallPtrSet<Decl *, 16> RedeclsDeserialized;
diff --git a/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp
index a897d86..c5153b5 100644
--- a/lib/Serialization/ASTReader.cpp
+++ b/lib/Serialization/ASTReader.cpp
@@ -6509,4 +6509,5 @@
J != F; ++J)
delete J->first;
}
+ assert(RedeclsAddedToAST.empty() && "RedeclsAddedToAST not empty!");
}
diff --git a/lib/Serialization/ASTReaderDecl.cpp b/lib/Serialization/ASTReaderDecl.cpp
index 85740de..e770c06 100644
--- a/lib/Serialization/ASTReaderDecl.cpp
+++ b/lib/Serialization/ASTReaderDecl.cpp
@@ -1777,9 +1777,11 @@
DeclContext *DC = New->getDeclContext()->getRedeclContext();
if (DC->isTranslationUnit() && Reader.SemaObj) {
- Reader.SemaObj->IdResolver.tryAddTopLevelDecl(New, New->getDeclName());
+ if (Reader.SemaObj->IdResolver.tryAddTopLevelDecl(New, New->getDeclName()))
+ Reader.RedeclsAddedToAST.insert(New);
} else if (DC->isNamespace()) {
DC->addDecl(New);
+ Reader.RedeclsAddedToAST.insert(New);
}
}
@@ -2154,7 +2156,13 @@
// AST consumer might need to know about, queue it.
// We don't pass it to the consumer immediately because we may be in recursive
// loading, and some declarations may still be initializing.
- if (isConsumerInterestedIn(D))
+ if (getContext().getLangOpts().Modules) {
+ if (RedeclsAddedToAST.count(D)) {
+ RedeclsAddedToAST.erase(D);
+ if (isConsumerInterestedIn(D))
+ InterestingDecls.push_back(D);
+ }
+ } else if (isConsumerInterestedIn(D))
InterestingDecls.push_back(D);
return D;
diff --git a/test/Modules/Inputs/templates-left.h b/test/Modules/Inputs/templates-left.h
index 7f50cd4..57a8c85 100644
--- a/test/Modules/Inputs/templates-left.h
+++ b/test/Modules/Inputs/templates-left.h
@@ -20,8 +20,10 @@
}
template <typename T>
-void pendingInstantiation(T) {}
+void pendingInstantiationEmit(T) {}
void triggerPendingInstantiation() {
- pendingInstantiation(12);
- pendingInstantiation(42.);
+ pendingInstantiationEmit(12);
+ pendingInstantiationEmit(42.);
}
+
+void redeclDefinitionEmit(){}
diff --git a/test/Modules/Inputs/templates-right.h b/test/Modules/Inputs/templates-right.h
index f5487fb..4ef4a32 100644
--- a/test/Modules/Inputs/templates-right.h
+++ b/test/Modules/Inputs/templates-right.h
@@ -19,7 +19,9 @@
}
template <typename T>
-void pendingInstantiation(T) {}
+void pendingInstantiationEmit(T) {}
void triggerPendingInstantiationToo() {
- pendingInstantiation(12);
+ pendingInstantiationEmit(12);
}
+
+void redeclDefinitionEmit(){}
diff --git a/test/Modules/templates.mm b/test/Modules/templates.mm
index a9b4591..e2d762c 100644
--- a/test/Modules/templates.mm
+++ b/test/Modules/templates.mm
@@ -1,6 +1,6 @@
// RUN: rm -rf %t
// RUN: %clang_cc1 -x objective-c++ -fmodules -fmodule-cache-path %t -I %S/Inputs -verify %s -Wno-objc-root-class
-// RUN: %clang_cc1 -x objective-c++ -fmodules -fmodule-cache-path %t -I %S/Inputs -emit-llvm %s -o - -Wno-objc-root-class | grep pendingInstantiation | FileCheck %s
+// RUN: %clang_cc1 -x objective-c++ -fmodules -fmodule-cache-path %t -I %S/Inputs -emit-llvm %s -o - -Wno-objc-root-class | grep Emit | FileCheck %s
@__experimental_modules_import templates_left;
@__experimental_modules_import templates_right;
@@ -18,11 +18,18 @@
}
void testPendingInstantiations() {
- // CHECK: call
- // CHECK: call
- // CHECK: {{define .*pendingInstantiation.*[(]i}}
- // CHECK: {{define .*pendingInstantiation.*[(]double}}
- // CHECK: call
+ // CHECK: call {{.*pendingInstantiationEmit}}
+ // CHECK: call {{.*pendingInstantiationEmit}}
+ // CHECK: define {{.*pendingInstantiationEmit.*[(]i}}
+ // CHECK: define {{.*pendingInstantiationEmit.*[(]double}}
triggerPendingInstantiation();
triggerPendingInstantiationToo();
}
+
+void testRedeclDefinition() {
+ // CHECK: define {{.*redeclDefinitionEmit}}
+ redeclDefinitionEmit();
+}
+
+// CHECK: call {{.*pendingInstantiation}}
+// CHECK: call {{.*redeclDefinitionEmit}}