[Clang] prevent preprocessor crash on incomplete scoped __has_cpp_attribute arguments (#178273)

Fixes #178098

---

This patch addressed the issue when `__has_cpp_attribute` is expanded
with incomplete scoped attributes. The scoped name parsing can lex to
`eof`/`eod` at


3f5a5d45d1/clang/lib/Lex/PPMacroExpansion.cpp (L1877-L1881)

and then proceed with


3f5a5d45d1/clang/lib/Lex/PPMacroExpansion.cpp (L1425-L1430)


since `eof`/`eod` is not guarded at


3f5a5d45d1/clang/lib/Lex/PPMacroExpansion.cpp (L1367-L1372)

this could lead to a preprocessor crash


3f5a5d45d1/clang/lib/Lex/PPMacroExpansion.cpp (L1370)
This commit is contained in:
Oleksandr Tarasiuk 2026-01-28 15:44:48 +02:00 committed by GitHub
parent 47e9c1db61
commit bf7e2b81e7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 29 additions and 2 deletions

View File

@ -210,6 +210,7 @@ Bug Fixes in This Version
- Fixed a failed assertion in the preprocessor when ``__has_embed`` parameters are missing parentheses. (#GH175088)
- Fix lifetime extension of temporaries in for-range-initializers in templates. (#GH165182)
- Fixed a preprocessor crash in ``__has_cpp_attribute`` on incomplete scoped attributes. (#GH178098)
Bug Fixes to Compiler Builtins
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

View File

@ -1364,7 +1364,7 @@ static void EvaluateFeatureLikeBuiltinMacro(llvm::raw_svector_ostream& OS,
Token ResultTok;
bool SuppressDiagnostic = false;
while (true) {
while (Tok.isNoneOf(tok::eod, tok::eof)) {
// Parse next token.
if (ExpandArgs)
PP.Lex(Tok);
@ -1443,7 +1443,7 @@ already_lexed:
PP.Diag(LParenLoc, diag::note_matching) << tok::l_paren;
SuppressDiagnostic = true;
}
}
}
}
/// Helper function to return the IdentifierInfo structure of a Token

View File

@ -14,3 +14,20 @@ __has_cpp_attribute(__clang__::fallthrough) // expected-error {{missing ')' afte
// expected-note {{to match this '('}} \
// expected-error {{builtin feature check macro requires a parenthesized identifier}}
namespace GH178098 {
// expected-error@+2 {{builtin feature check macro requires a parenthesized identifier}}
// expected-error@+1 {{expected value in expression}}
#if __has_cpp_attribute(clang::
#endif
// expected-error@+4 {{unterminated function-like macro invocation}}
// expected-error@+3 {{missing ')' after 'clang'}}
// expected-error@+2 {{expected value in expression}}
// expected-note@+1 {{to match this '('}}
#if __has_attribute(clang::
#endif
// expected-error@+3 {{builtin feature check macro requires a parenthesized identifier}}
// expected-error@+2 {{unterminated function-like macro invocation}}
__has_cpp_attribute(clang::
}

View File

@ -0,0 +1,9 @@
// RUN: %clang_cc1 -triple i386-unknown-unknown -Eonly -verify %s
// expected-error@+2 {{builtin feature check macro requires a parenthesized identifier}}
// expected-error@+1 {{expected value in expression}}
#if __has_c_attribute(clang::
#endif
// expected-error@+1 {{builtin feature check macro requires a parenthesized identifier}}
__has_c_attribute(clang::