commit 2600c63d968f9f58751a8bcdd6d48e08b55e7649
author Richard Smith <richard-llvm@metafoo.co.uk> Wed May 30 20:24:10 2018 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Wed May 30 20:24:10 2018 +0000
tree 44a3175b176a2289217f68a6eda673de6d1751db
parent 936d50aeea856fde070ba17571e48e9713047550

PR34520: after instantiating a non-templated member deduction guide, don't forget to push it into the class scope.

llvm-svn: 333589

clang/lib/Sema/SemaTemplateInstantiateDecl.cpp

diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
index cd80215..dd62d4c 100644
--- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -2833,7 +2833,10 @@
 
 Decl *
 TemplateDeclInstantiator::VisitCXXDeductionGuideDecl(CXXDeductionGuideDecl *D) {
-  return VisitFunctionDecl(D, nullptr);
+  Decl *Inst = VisitFunctionDecl(D, nullptr);
+  if (Inst && !D->getDescribedFunctionTemplate())
+    Owner->addDecl(Inst);
+  return Inst;
 }
 
 Decl *TemplateDeclInstantiator::VisitCXXMethodDecl(CXXMethodDecl *D) {