Introduced DeclContext::isDependentContext, which determines whether a
given DeclContext is dependent on type parameters. Use this to
properly determine whether a TagDecl is dependent; previously, we were
missing the case where the TagDecl is a local class of a member
function of a class template (phew!).
Also, make sure that, when we instantiate declarations within a member
function of a class template (or a function template, eventually),
that we add those declarations to the "instantiated locals" map so
that they can be found when instantiating declaration references.
Unfortunately, I was not able to write a useful test for this change,
although the assert() that fires when uncommenting the FIXME'd line in
test/SemaTemplate/instantiate-declref.cpp tells the "experienced user"
that we're now doing the right thing.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@72526 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/clang/AST/Decl.h b/include/clang/AST/Decl.h
index eb38367..e134aed 100644
--- a/include/clang/AST/Decl.h
+++ b/include/clang/AST/Decl.h
@@ -1081,7 +1081,7 @@
/// \brief Whether this declaration declares a type that is
/// dependent, i.e., a type that somehow depends on template
/// parameters.
- bool isDependentType() const;
+ bool isDependentType() const { return isDependentContext(); }
/// @brief Starts the definition of this tag declaration.
///
diff --git a/include/clang/AST/DeclBase.h b/include/clang/AST/DeclBase.h
index 7d88cf2..271e59a 100644
--- a/include/clang/AST/DeclBase.h
+++ b/include/clang/AST/DeclBase.h
@@ -441,6 +441,10 @@
return DeclKind == Decl::Namespace;
}
+ /// \brief Determines whether this context is dependent on a
+ /// template parameter.
+ bool isDependentContext() const;
+
/// isTransparentContext - Determines whether this context is a
/// "transparent" context, meaning that the members declared in this
/// context are semantically declared in the nearest enclosing
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
index 6c62071..0639140 100644
--- a/lib/AST/Decl.cpp
+++ b/lib/AST/Decl.cpp
@@ -528,19 +528,6 @@
// TagDecl Implementation
//===----------------------------------------------------------------------===//
-bool TagDecl::isDependentType() const {
- if (const CXXRecordDecl *Record = dyn_cast<CXXRecordDecl>(this))
- if (Record->getDescribedClassTemplate())
- return true;
-
- if (const TagDecl *TD = dyn_cast_or_null<TagDecl>(getDeclContext()))
- return TD->isDependentType();
-
- // FIXME: Tag types declared function templates are dependent types.
- // FIXME: Look through block scopes.
- return false;
-}
-
void TagDecl::startDefinition() {
TagType *TagT = const_cast<TagType *>(TypeForDecl->getAsTagType());
TagT->decl.setPointer(this);
diff --git a/lib/AST/DeclBase.cpp b/lib/AST/DeclBase.cpp
index 071fb79..ba8f335 100644
--- a/lib/AST/DeclBase.cpp
+++ b/lib/AST/DeclBase.cpp
@@ -396,6 +396,21 @@
(*D++)->Destroy(C);
}
+bool DeclContext::isDependentContext() const {
+ if (isFileContext())
+ return false;
+
+ if (const CXXRecordDecl *Record = dyn_cast<CXXRecordDecl>(this))
+ if (Record->getDescribedClassTemplate())
+ return true;
+
+ if (const FunctionDecl *Function = dyn_cast<FunctionDecl>(this))
+ if (Function->getDescribedFunctionTemplate())
+ return true;
+
+ return getParent() && getParent()->isDependentContext();
+}
+
bool DeclContext::isTransparentContext() const {
if (DeclKind == Decl::Enum)
return true; // FIXME: Check for C++0x scoped enums
diff --git a/lib/Sema/SemaTemplateInstantiateDecl.cpp b/lib/Sema/SemaTemplateInstantiateDecl.cpp
index 33eedce..39e455a 100644
--- a/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -97,6 +97,9 @@
Typedef->setInvalidDecl();
Owner->addDecl(SemaRef.Context, Typedef);
+ if (Owner->isFunctionOrMethod())
+ SemaRef.CurrentInstantiationScope->InstantiatedLocal(D, Typedef);
+
return Typedef;
}
@@ -211,6 +214,8 @@
Enum->setInstantiationOfMemberEnum(D);
Enum->setAccess(D->getAccess());
Owner->addDecl(SemaRef.Context, Enum);
+ if (Owner->isFunctionOrMethod())
+ SemaRef.CurrentInstantiationScope->InstantiatedLocal(D, Enum);
Enum->startDefinition();
llvm::SmallVector<Sema::DeclPtrTy, 16> Enumerators;
@@ -276,6 +281,8 @@
Record->setInstantiationOfMemberClass(D);
Owner->addDecl(SemaRef.Context, Record);
+ if (Owner->isFunctionOrMethod())
+ SemaRef.CurrentInstantiationScope->InstantiatedLocal(D, Record);
return Record;
}
diff --git a/test/SemaTemplate/instantiate-declref.cpp b/test/SemaTemplate/instantiate-declref.cpp
index 1a5f216..e49d330 100644
--- a/test/SemaTemplate/instantiate-declref.cpp
+++ b/test/SemaTemplate/instantiate-declref.cpp
@@ -1,5 +1,4 @@
// RUN: clang-cc -fsyntax-only -verify %s
-
namespace N {
struct Outer {
struct Inner {