[clang] [clang] Allow trivial pp-directives before C++ module directive (PR #153641)
via cfe-commits
cfe-commits at lists.llvm.org
Fri Aug 15 08:35:45 PDT 2025
github-actions[bot] wrote:
<!--LLVM CODE FORMAT COMMENT: {clang-format}-->
:warning: C/C++ code formatter, clang-format found issues in your code. :warning:
<details>
<summary>
You can test this locally with the following command:
</summary>
``````````bash
git-clang-format --diff HEAD~1 HEAD --extensions cpp,h -- clang/include/clang/Lex/TrivialPPDirectiveTracer.h clang/include/clang/Lex/Lexer.h clang/include/clang/Lex/Preprocessor.h clang/include/clang/Lex/Token.h clang/include/clang/Sema/Sema.h clang/lib/Lex/Lexer.cpp clang/lib/Lex/Preprocessor.cpp clang/lib/Parse/Parser.cpp clang/lib/Sema/SemaModule.cpp clang/test/CXX/module/cpp.pre/module_decl.cpp clang/unittests/Lex/LexerTest.cpp clang/unittests/Lex/ModuleDeclStateTest.cpp
``````````
</details>
<details>
<summary>
View the diff from clang-format here.
</summary>
``````````diff
diff --git a/clang/include/clang/Lex/Preprocessor.h b/clang/include/clang/Lex/Preprocessor.h
index 8bf5ac327..f204c69c5 100644
--- a/clang/include/clang/Lex/Preprocessor.h
+++ b/clang/include/clang/Lex/Preprocessor.h
@@ -3099,7 +3099,8 @@ public:
bool setDeserializedSafeBufferOptOutMap(
const SmallVectorImpl<SourceLocation> &SrcLocSeqs);
- /// Whether we've seen pp-directives which may have changed the preprocessing state.
+ /// Whether we've seen pp-directives which may have changed the preprocessing
+ /// state.
bool hasSeenNoTrivialPPDirective() const;
private:
diff --git a/clang/unittests/Lex/ModuleDeclStateTest.cpp b/clang/unittests/Lex/ModuleDeclStateTest.cpp
index 1ae7d49c5..d53d537bc 100644
--- a/clang/unittests/Lex/ModuleDeclStateTest.cpp
+++ b/clang/unittests/Lex/ModuleDeclStateTest.cpp
@@ -112,7 +112,8 @@ export module foo;
std::unique_ptr<Preprocessor> PP = getPreprocessor(source, Language::CXX);
std::initializer_list<bool> ImportKinds = {};
- auto Callback = std::make_unique<CheckNamedModuleImportingCB>(*PP, ImportKinds);
+ auto Callback =
+ std::make_unique<CheckNamedModuleImportingCB>(*PP, ImportKinds);
CheckNamedModuleImportingCB *CallbackPtr = Callback.get();
preprocess(*PP, std::move(Callback));
EXPECT_EQ(CallbackPtr->importNamedModuleNum(), (size_t)0);
@@ -129,7 +130,8 @@ module foo;
std::unique_ptr<Preprocessor> PP = getPreprocessor(source, Language::CXX);
std::initializer_list<bool> ImportKinds = {};
- auto Callback = std::make_unique<CheckNamedModuleImportingCB>(*PP, ImportKinds);
+ auto Callback =
+ std::make_unique<CheckNamedModuleImportingCB>(*PP, ImportKinds);
CheckNamedModuleImportingCB *CallbackPtr = Callback.get();
preprocess(*PP, std::move(Callback));
EXPECT_EQ(CallbackPtr->importNamedModuleNum(), (size_t)0);
@@ -146,7 +148,8 @@ module foo:part;
std::unique_ptr<Preprocessor> PP = getPreprocessor(source, Language::CXX);
std::initializer_list<bool> ImportKinds = {};
- auto Callback = std::make_unique<CheckNamedModuleImportingCB>(*PP, ImportKinds);
+ auto Callback =
+ std::make_unique<CheckNamedModuleImportingCB>(*PP, ImportKinds);
CheckNamedModuleImportingCB *CallbackPtr = Callback.get();
preprocess(*PP, std::move(Callback));
EXPECT_EQ(CallbackPtr->importNamedModuleNum(), (size_t)0);
@@ -163,7 +166,8 @@ export module foo:part;
std::unique_ptr<Preprocessor> PP = getPreprocessor(source, Language::CXX);
std::initializer_list<bool> ImportKinds = {};
- auto Callback = std::make_unique<CheckNamedModuleImportingCB>(*PP, ImportKinds);
+ auto Callback =
+ std::make_unique<CheckNamedModuleImportingCB>(*PP, ImportKinds);
CheckNamedModuleImportingCB *CallbackPtr = Callback.get();
preprocess(*PP, std::move(Callback));
EXPECT_EQ(CallbackPtr->importNamedModuleNum(), (size_t)0);
@@ -180,7 +184,8 @@ export module foo.dot:part.dot;
std::unique_ptr<Preprocessor> PP = getPreprocessor(source, Language::CXX);
std::initializer_list<bool> ImportKinds = {};
- auto Callback = std::make_unique<CheckNamedModuleImportingCB>(*PP, ImportKinds);
+ auto Callback =
+ std::make_unique<CheckNamedModuleImportingCB>(*PP, ImportKinds);
CheckNamedModuleImportingCB *CallbackPtr = Callback.get();
preprocess(*PP, std::move(Callback));
EXPECT_EQ(CallbackPtr->importNamedModuleNum(), (size_t)0);
@@ -197,7 +202,8 @@ TEST_F(ModuleDeclStateTest, NotModule) {
std::unique_ptr<Preprocessor> PP = getPreprocessor(source, Language::CXX);
std::initializer_list<bool> ImportKinds = {};
- auto Callback = std::make_unique<CheckNamedModuleImportingCB>(*PP, ImportKinds);
+ auto Callback =
+ std::make_unique<CheckNamedModuleImportingCB>(*PP, ImportKinds);
CheckNamedModuleImportingCB *CallbackPtr = Callback.get();
preprocess(*PP, std::move(Callback));
EXPECT_EQ(CallbackPtr->importNamedModuleNum(), (size_t)0);
@@ -221,7 +227,8 @@ import :another;
std::unique_ptr<Preprocessor> PP = getPreprocessor(source, Language::CXX);
std::initializer_list<bool> ImportKinds = {true, true};
- auto Callback = std::make_unique<CheckNamedModuleImportingCB>(*PP, ImportKinds);
+ auto Callback =
+ std::make_unique<CheckNamedModuleImportingCB>(*PP, ImportKinds);
CheckNamedModuleImportingCB *CallbackPtr = Callback.get();
preprocess(*PP, std::move(Callback));
EXPECT_EQ(CallbackPtr->importNamedModuleNum(), (size_t)2);
@@ -246,7 +253,8 @@ import :another;
std::unique_ptr<Preprocessor> PP = getPreprocessor(source, Language::CXX);
std::initializer_list<bool> ImportKinds = {true, true};
- auto Callback = std::make_unique<CheckNamedModuleImportingCB>(*PP, ImportKinds);
+ auto Callback =
+ std::make_unique<CheckNamedModuleImportingCB>(*PP, ImportKinds);
CheckNamedModuleImportingCB *CallbackPtr = Callback.get();
preprocess(*PP, std::move(Callback));
EXPECT_EQ(CallbackPtr->importNamedModuleNum(), (size_t)2);
@@ -270,7 +278,8 @@ import :another;
std::unique_ptr<Preprocessor> PP = getPreprocessor(source, Language::CXX);
std::initializer_list<bool> ImportKinds = {true};
- auto Callback = std::make_unique<CheckNamedModuleImportingCB>(*PP, ImportKinds);
+ auto Callback =
+ std::make_unique<CheckNamedModuleImportingCB>(*PP, ImportKinds);
CheckNamedModuleImportingCB *CallbackPtr = Callback.get();
preprocess(*PP, std::move(Callback));
EXPECT_EQ(CallbackPtr->importNamedModuleNum(), (size_t)1);
@@ -286,7 +295,8 @@ TEST_F(ModuleDeclStateTest, ImportAClangNamedModule) {
std::unique_ptr<Preprocessor> PP = getPreprocessor(source, Language::ObjCXX);
std::initializer_list<bool> ImportKinds = {false};
- auto Callback = std::make_unique<CheckNamedModuleImportingCB>(*PP, ImportKinds);
+ auto Callback =
+ std::make_unique<CheckNamedModuleImportingCB>(*PP, ImportKinds);
CheckNamedModuleImportingCB *CallbackPtr = Callback.get();
preprocess(*PP, std::move(Callback));
EXPECT_EQ(CallbackPtr->importNamedModuleNum(), (size_t)1);
@@ -306,7 +316,8 @@ import M2;
std::unique_ptr<Preprocessor> PP = getPreprocessor(source, Language::ObjCXX);
std::initializer_list<bool> ImportKinds = {false, true, false, true};
- auto Callback = std::make_unique<CheckNamedModuleImportingCB>(*PP, ImportKinds);
+ auto Callback =
+ std::make_unique<CheckNamedModuleImportingCB>(*PP, ImportKinds);
CheckNamedModuleImportingCB *CallbackPtr = Callback.get();
preprocess(*PP, std::move(Callback));
EXPECT_EQ(CallbackPtr->importNamedModuleNum(), (size_t)4);
``````````
</details>
https://github.com/llvm/llvm-project/pull/153641
More information about the cfe-commits
mailing list