[clang] [clang] Prevent stack overflow during recursive ADL (PR #242618)

Daniel Petrovic via cfe-commits cfe-commits at lists.llvm.org
Sat Nov 14 01:15:54 PST 2026


https://github.com/daniel-petrovic updated https://github.com/llvm/llvm-project/pull/242618

>From 79d2c9f022b1014b1aaa8ed5a25fdaffa97cddb7 Mon Sep 17 00:00:00 2001
From: Daniel Petrovic <daniel-dev at hotmail.de>
Date: Sat, 14 Nov 2026 10:09:41 +0100
Subject: [PATCH] [clang] Prevent stack overflow during recursive ADL

Add missing stack guard in  sema lookup helper addAssociatedClassesAndNamespaces
Fixes: #242311
---
 clang/lib/Sema/SemaLookup.cpp   | 6 ++++--
 clang/lib/Sema/SemaOverload.cpp | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/clang/lib/Sema/SemaLookup.cpp b/clang/lib/Sema/SemaLookup.cpp
index 5e061103437670..880cce5536c0fc 100644
--- a/clang/lib/Sema/SemaLookup.cpp
+++ b/clang/lib/Sema/SemaLookup.cpp
@@ -3114,8 +3114,10 @@ addAssociatedClassesAndNamespaces(AssociatedLookup &Result,
     CollectEnclosingNamespace(Result.Namespaces, Ctx);
 
     const TemplateArgumentList &TemplateArgs = Spec->getTemplateArgs();
-    for (unsigned I = 0, N = TemplateArgs.size(); I != N; ++I)
-      addAssociatedClassesAndNamespaces(Result, TemplateArgs[I]);
+    Result.S.runWithSufficientStackSpace(Result.InstantiationLoc, [&] {
+      for (unsigned I = 0, N = TemplateArgs.size(); I != N; ++I)
+        addAssociatedClassesAndNamespaces(Result, TemplateArgs[I]);
+    });
   }
 
   // Add the class itself. If we've already transitively visited this class,
diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp
index a015a6b2052763..b9df1991a79769 100644
--- a/clang/lib/Sema/SemaOverload.cpp
+++ b/clang/lib/Sema/SemaOverload.cpp
@@ -13609,6 +13609,10 @@ void OverloadCandidateSet::NoteCandidates(
     ArrayRef<Expr *> Args, StringRef Opc, SourceLocation OpLoc,
     llvm::function_ref<bool(OverloadCandidate &)> Filter) {
 
+  if (S.Diags.hasFatalErrorOccurred())
+    return; // Return to avoid stack overflow by formatting diagnostic text
+            // after hitting template-depth error
+
   auto Cands = CompleteCandidates(S, OCD, Args, OpLoc, Filter);
 
   {



More information about the cfe-commits mailing list