[clang] [Clang] Avoid null deref in lambda attribute compat warning (PR #161096)

[Oleksandr T. via cfe-commits]

https://github.com/a-tarasyuk updated https://github.com/llvm/llvm-project/pull/161096

>From 402688baf8fded4d92c5767aa177a21eaffff6a9 Mon Sep 17 00:00:00 2001
From: Oleksandr Tarasiuk <oleksandr.tarasiuk at outlook.com>
Date: Sun, 28 Sep 2025 23:45:51 +0300
Subject: [PATCH] [Clang] Avoid null deref in lambda attribute compat warning

---
 clang/docs/ReleaseNotes.rst                       |  2 ++
 clang/include/clang/Basic/DiagnosticParseKinds.td |  2 +-
 clang/test/Parser/cxx2b-lambdas-ext-warns.cpp     | 14 ++++++++++++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
index 98c889c08b329..1e8c2cc35e37f 100644
--- a/clang/docs/ReleaseNotes.rst
+++ b/clang/docs/ReleaseNotes.rst
@@ -432,6 +432,8 @@ Bug Fixes to C++ Support
 - Fix an assertion failure when taking the address on a non-type template parameter argument of
   object type. (#GH151531)
 - Suppress ``-Wdouble-promotion`` when explicitly asked for with C++ list initialization (#GH33409).
+- Fixed a crash in the pre-C++23 warning for attributes before a lambda
+  declarator by unifying format args to ``%0`` as attribute name, ``%1`` as selector (#GH161070).
 
 Bug Fixes to AST Handling
 ^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/clang/include/clang/Basic/DiagnosticParseKinds.td b/clang/include/clang/Basic/DiagnosticParseKinds.td
index 4d9e123eb4ef1..a098db58eac23 100644
--- a/clang/include/clang/Basic/DiagnosticParseKinds.td
+++ b/clang/include/clang/Basic/DiagnosticParseKinds.td
@@ -1147,7 +1147,7 @@ def ext_lambda_missing_parens : ExtWarn<
   "lambda without a parameter clause is a C++23 extension">,
   InGroup<CXX23>;
 def warn_cxx20_compat_decl_attrs_on_lambda : Warning<
-  "%select{an attribute specifier sequence|%1}0 in this position "
+  "%select{an attribute specifier sequence|%0}1 in this position "
   "is incompatible with C++ standards before C++23">,
   InGroup<CXXPre23Compat>, DefaultIgnore;
 
diff --git a/clang/test/Parser/cxx2b-lambdas-ext-warns.cpp b/clang/test/Parser/cxx2b-lambdas-ext-warns.cpp
index 7ffb7aae9d391..d781e0bec14e7 100644
--- a/clang/test/Parser/cxx2b-lambdas-ext-warns.cpp
+++ b/clang/test/Parser/cxx2b-lambdas-ext-warns.cpp
@@ -3,8 +3,6 @@
 // RUN: %clang_cc1 -std=c++23 -Wpre-c++23-compat %s -verify=precxx23
 // RUN: %clang_cc1 -std=c++23 -pedantic %s -verify=cxx23
 
-//cxx23-no-diagnostics
-
 auto L1 = [] constexpr {};
 // cxx20-warning at -1 {{lambda without a parameter clause is a C++23 extension}}
 auto L2 = []() static {};
@@ -14,3 +12,15 @@ auto L3 = [] static {};
 // cxx20-warning at -1 {{lambda without a parameter clause is a C++23 extension}}
 // cxx20-warning at -2 {{static lambdas are a C++23 extension}}
 // precxx23-warning at -3 {{static lambdas are incompatible with C++ standards before C++23}}
+
+namespace GH161070 {
+void t() { int a = [] [[assume(true)]]; }
+// precxx23-error at -1 {{'assume' attribute cannot be applied to a declaration}}
+// precxx23-error at -2 {{expected body of lambda expression}}
+// cxx23-error at -3 {{'assume' attribute cannot be applied to a declaration}}
+// cxx23-error at -4 {{expected body of lambda expression}}
+// cxx20-error at -5 {{'assume' attribute cannot be applied to a declaration}}
+// cxx20-error at -6 {{expected body of lambda expression}}
+// cxx20-warning at -7 {{an attribute specifier sequence in this position is a C++23 extension}}
+// precxx23-warning at -8 {{an attribute specifier sequence in this position is incompatible with C++ standards before C++23}}
+}