commit 604e7f14d672af80ca5b9044f30f3dc23d37ddd5
author John McCall <rjmccall@apple.com> Tue Dec 08 07:46:18 2009 +0000
committer John McCall <rjmccall@apple.com> Tue Dec 08 07:46:18 2009 +0000
tree de3d2fe20f8706b9592c8d50fad7fd6c91f2e846
parent e8174bc483615e79614d9284a50ac94831e8b7c6

Correctly implement the C++03 and 0x restrictions on class-member using
declarations.



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

lib/Sema/SemaTemplateInstantiateDecl.cpp

diff --git a/lib/Sema/SemaTemplateInstantiateDecl.cpp b/lib/Sema/SemaTemplateInstantiateDecl.cpp
index 432217d..c5173bb 100644
--- a/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -1071,17 +1071,12 @@
     cast<NamedDecl>(SemaRef.FindInstantiatedDecl(D->getTargetDecl(),
                                                  TemplateArgs));
 
-  UsingShadowDecl *InstD = UsingShadowDecl::Create(SemaRef.Context, Owner,
-                                                   InstUsing->getLocation(),
-                                                   InstUsing, InstTarget);
-  InstUsing->addShadowDecl(InstD);
-
-  if (InstTarget->isInvalidDecl() || InstUsing->isInvalidDecl())
-    InstD->setInvalidDecl();
+  UsingShadowDecl *InstD = SemaRef.BuildUsingShadowDecl(/*Scope*/ 0,
+                                                        D->getAccess(),
+                                                        InstUsing,
+                                                        InstTarget);
 
   SemaRef.Context.setInstantiatedFromUsingShadowDecl(InstD, D);
-  InstD->setAccess(D->getAccess());
-  Owner->addDecl(InstD);
 
   return InstD;
 }