llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang Author: Mariya Podchishchaeva (Fznamznon) <details> <summary>Changes</summary> It seems for C++ lexer has some caching ability which doesn't expect injecting "new" tokens in the middle of the cache. Technically #embed tokens are not completely new since they have already been read from the file and there was #embed annotation token in this place, so set `reinject` flag for them to silence assertion. --- Full diff: https://github.com/llvm/llvm-project/pull/99624.diff 2 Files Affected: - (modified) clang/lib/Parse/ParseExpr.cpp (+1-1) - (modified) clang/test/Preprocessor/embed_weird.cpp (+8) ``````````diff diff --git a/clang/lib/Parse/ParseExpr.cpp b/clang/lib/Parse/ParseExpr.cpp index 3d7c58e5b3c3c..a12c375c8d48c 100644 --- a/clang/lib/Parse/ParseExpr.cpp +++ b/clang/lib/Parse/ParseExpr.cpp @@ -3597,7 +3597,7 @@ void Parser::injectEmbedTokens() { I += 2; } PP.EnterTokenStream(std::move(Toks), /*DisableMacroExpansion=*/true, - /*IsReinject=*/false); + /*IsReinject=*/true); ConsumeAnyToken(/*ConsumeCodeCompletionTok=*/true); } diff --git a/clang/test/Preprocessor/embed_weird.cpp b/clang/test/Preprocessor/embed_weird.cpp index cc73a88e5a657..f533230111b43 100644 --- a/clang/test/Preprocessor/embed_weird.cpp +++ b/clang/test/Preprocessor/embed_weird.cpp @@ -115,3 +115,11 @@ void f1() { }; } #endif + +static_assert(_Generic( +#embed __FILE__ limit(1) + , int : 1, default : 0)); + +static_assert(alignof(typeof( +#embed __FILE__ limit(1) +)) == alignof(int)); `````````` </details> https://github.com/llvm/llvm-project/pull/99624 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
