[llvm-branch-commits] [clang] d502822 - [C] static_assert in a for loop is not an extension (#151955)

[Tobias Hieta via llvm-branch-commits]

Author: Aaron Ballman
Date: 2025-08-05T10:57:49+02:00
New Revision: d502822e682a1147e64e63ae93af2e8f794f05b0

URL: https://github.com/llvm/llvm-project/commit/d502822e682a1147e64e63ae93af2e8f794f05b0
DIFF: https://github.com/llvm/llvm-project/commit/d502822e682a1147e64e63ae93af2e8f794f05b0.diff

LOG: [C] static_assert in a for loop is not an extension (#151955)

The original wording can be squinted at to pretend this was always
allowed. GCC squints at it that way, so we're doing the same and no
longer issuing an extension diagnostic for use of static_assert in the
condition-1 of a for loop in C.

Fixes #149633

(cherry picked from commit cb50d78a0063244434d883d89ddda7f74abbffc9)

Added: 
    

Modified: 
    clang/lib/Sema/SemaStmt.cpp
    clang/test/Sema/for.c

Removed: 
    


################################################################################
diff  --git a/clang/lib/Sema/SemaStmt.cpp b/clang/lib/Sema/SemaStmt.cpp
index f85826aecadf3..f46be75bda20f 100644
--- a/clang/lib/Sema/SemaStmt.cpp
+++ b/clang/lib/Sema/SemaStmt.cpp
@@ -2287,7 +2287,11 @@ StmtResult Sema::ActOnForStmt(SourceLocation ForLoc, SourceLocation LParenLoc,
           // we can diagnose if we don't see any variable declarations. This
           // covers a case like declaring a typedef, function, or structure
           // type rather than a variable.
-          NonVarSeen = DI;
+          //
+          // Note, _Static_assert is acceptable because it does not declare an
+          // identifier at all, so "for object having" does not apply.
+          if (!isa<StaticAssertDecl>(DI))
+            NonVarSeen = DI;
         }
       }
       // Diagnose if we saw a non-variable declaration but no variable

diff  --git a/clang/test/Sema/for.c b/clang/test/Sema/for.c
index e16169aac0c4c..35c4720ef3305 100644
--- a/clang/test/Sema/for.c
+++ b/clang/test/Sema/for.c
@@ -26,6 +26,5 @@ void b11 (void) { for (static _Thread_local struct { int i; } s;s.i;); } /* c11-
 #endif
 
 void b12(void) {
-  for(_Static_assert(1, "");;) {} /* c11-warning {{non-variable declaration in 'for' loop is a C23 extension}}
-                                     c23-warning {{non-variable declaration in 'for' loop is incompatible with C standards before C23}} */
+  for(_Static_assert(1, "");;) {} /* okay, _Static_assert declares *no* identifiers */
 }