commit c5a89a1cc2f168ad0a115c560b8de5f1c952d8c5
author Richard Smith <richard-llvm@metafoo.co.uk> Mon Apr 02 01:30:27 2012 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Mon Apr 02 01:30:27 2012 +0000
tree f2fa73048310663a8c7025cc852be2dcdc0d78ba
parent 651f3d44dbae18c74c5f475d7a601d65b07b45c4

Basic semantic analysis support for inheriting constructor declarations in
dependent contexts.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@153858 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Sema/SemaTemplateInstantiateDecl.cpp

diff --git a/lib/Sema/SemaTemplateInstantiateDecl.cpp b/lib/Sema/SemaTemplateInstantiateDecl.cpp
index 8e49429..ba1bc9f 100644
--- a/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -1856,6 +1856,12 @@
   if (NewUD->isInvalidDecl())
     return NewUD;
 
+  if (NameInfo.getName().getNameKind() == DeclarationName::CXXConstructorName) {
+    if (SemaRef.CheckInheritingConstructorUsingDecl(NewUD))
+      NewUD->setInvalidDecl();
+    return NewUD;
+  }
+
   bool isFunctionScope = Owner->isFunctionOrMethod();
 
   // Process the shadow decls.