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

1 files changed, 4 insertions, 9 deletions

diff --git a/lib/Sema/SemaTemplateInstantiateDecl.cpp b/lib/Sema/SemaTemplateInstantiateDecl.cpp
index 432217d3c4..c5173bbca7 100644
--- a/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -1071,17 +1071,12 @@ Decl *TemplateDeclInstantiator::VisitUsingShadowDecl(UsingShadowDecl *D) {
     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;
 }