Skip to content

Commit d502822

Browse files
AaronBallmantru
authored andcommitted
[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 cb50d78)
1 parent 1d46440 commit d502822

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

clang/lib/Sema/SemaStmt.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2287,7 +2287,11 @@ StmtResult Sema::ActOnForStmt(SourceLocation ForLoc, SourceLocation LParenLoc,
22872287
// we can diagnose if we don't see any variable declarations. This
22882288
// covers a case like declaring a typedef, function, or structure
22892289
// type rather than a variable.
2290-
NonVarSeen = DI;
2290+
//
2291+
// Note, _Static_assert is acceptable because it does not declare an
2292+
// identifier at all, so "for object having" does not apply.
2293+
if (!isa<StaticAssertDecl>(DI))
2294+
NonVarSeen = DI;
22912295
}
22922296
}
22932297
// Diagnose if we saw a non-variable declaration but no variable

clang/test/Sema/for.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,5 @@ void b11 (void) { for (static _Thread_local struct { int i; } s;s.i;); } /* c11-
2626
#endif
2727

2828
void b12(void) {
29-
for(_Static_assert(1, "");;) {} /* c11-warning {{non-variable declaration in 'for' loop is a C23 extension}}
30-
c23-warning {{non-variable declaration in 'for' loop is incompatible with C standards before C23}} */
29+
for(_Static_assert(1, "");;) {} /* okay, _Static_assert declares *no* identifiers */
3130
}

0 commit comments

Comments
 (0)