[clang] [Clang][Sema] fix outline member function template with default align crash (PR #78400)

Qizhi Hu via cfe-commits cfe-commits at lists.llvm.org
Fri Jan 19 07:55:06 PST 2024


https://github.com/jcsxky updated https://github.com/llvm/llvm-project/pull/78400

>From 4c1f1d6427f27f7ed3cee8b49ee43a96025f2f0e Mon Sep 17 00:00:00 2001
From: huqizhi <huqizhi at feysh.com>
Date: Wed, 17 Jan 2024 14:16:34 +0800
Subject: [PATCH] fix

---
 clang/lib/Sema/SemaTemplateInstantiate.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/clang/lib/Sema/SemaTemplateInstantiate.cpp b/clang/lib/Sema/SemaTemplateInstantiate.cpp
index fc80515b45e35b..286da30529f038 100644
--- a/clang/lib/Sema/SemaTemplateInstantiate.cpp
+++ b/clang/lib/Sema/SemaTemplateInstantiate.cpp
@@ -3064,10 +3064,14 @@ bool Sema::SubstDefaultArgument(
       if (addInstantiatedParametersToScope(FD, PatternFD, *LIS, TemplateArgs))
         return true;
     }
-
+    auto *CurrentTemplateArgumentList = TemplateArgumentList::CreateCopy(
+        getASTContext(), TemplateArgs.getInnermost());
+    auto NewTemplateArgs = getTemplateInstantiationArgs(
+        FD, FD->getDeclContext(), true, CurrentTemplateArgumentList, true,
+        nullptr, false, false);
     runWithSufficientStackSpace(Loc, [&] {
-      Result = SubstInitializer(PatternExpr, TemplateArgs,
-                                /*DirectInit*/false);
+      Result = SubstInitializer(PatternExpr, NewTemplateArgs,
+                                /*DirectInit*/ false);
     });
   }
   if (Result.isInvalid())



More information about the cfe-commits mailing list