https://github.com/jmmartinez updated
https://github.com/llvm/llvm-project/pull/137665
From 72bc06251047bb92a5bc6a068670b047c078a3c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Manuel=20Martinez=20Caama=C3=B1o?= <juama...@amd.com>
Date: Mon, 28 Apr 2025 17:05:46 +0200
Subject: [PATCH 1/4] Pre-commit test: [Preprocessor] Do not expand macros if
the input is already preprocessed
---
clang/test/Preprocessor/preprocess-cpp-output.c | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100644 clang/test/Preprocessor/preprocess-cpp-output.c
diff --git a/clang/test/Preprocessor/preprocess-cpp-output.c
b/clang/test/Preprocessor/preprocess-cpp-output.c
new file mode 100644
index 0000000000000..59ff057e9b871
--- /dev/null
+++ b/clang/test/Preprocessor/preprocess-cpp-output.c
@@ -0,0 +1,9 @@
+// RUN: %clang_cc1 -E -x c %s | FileCheck %s --check-prefixes=EXPANDED
+// RUN: %clang_cc1 -E -x cpp-output %s | FileCheck %s --check-prefixes=EXPANDED
+
+// EXPANDED: void __attribute__((__attribute__((always_inline)))) foo()
+
+#define always_inline __attribute__((always_inline))
+void __attribute__((always_inline)) foo() {
+ return 4;
+}
From d6ca7b96d410348ace49cfea5666d83ecc9ca98a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Manuel=20Martinez=20Caama=C3=B1o?= <juama...@amd.com>
Date: Tue, 13 May 2025 15:03:46 +0200
Subject: [PATCH 2/4] [Modules] initializers.cpp test fix
The module contents should not contain preprocessor directives. The
contents should be already preprocessed.
Duplicate the modules instead to propose 2 versions: one with the
namespace ns and one without.
---
clang/test/Modules/initializers.cpp | 59 +++++++++++++++++++++++++++--
1 file changed, 55 insertions(+), 4 deletions(-)
diff --git a/clang/test/Modules/initializers.cpp
b/clang/test/Modules/initializers.cpp
index dcd9b08ec6f7a..e1f826fbc09f3 100644
--- a/clang/test/Modules/initializers.cpp
+++ b/clang/test/Modules/initializers.cpp
@@ -48,6 +48,7 @@
// instantiation for v<int> in one of the two headers, because we will only
// parse one of the two get() functions.
+#ifdef NS
#pragma clang module build m
module m {
module a {
@@ -60,9 +61,7 @@ module m {
#pragma clang module begin m.a
inline int non_trivial() { return 3; }
-#ifdef NS
namespace ns {
-#endif
int a = non_trivial();
inline int b = non_trivial();
@@ -102,12 +101,64 @@ inline void use(bool b, ...) {
X<int>::e<int>, X<int>::f<int>, X<int>::g<int>, X<int>::h<int>);
}
-#ifdef NS
}
-#endif
#pragma clang module end
#pragma clang module endbuild
+#else
+#pragma clang module build m
+module m {
+ module a {
+ header "foo.h" { size 123 mtime 456789 }
+ }
+ module b {}
+}
+
+#pragma clang module contents
+#pragma clang module begin m.a
+inline int non_trivial() { return 3; }
+
+int a = non_trivial();
+inline int b = non_trivial();
+thread_local int c = non_trivial();
+inline thread_local int d = non_trivial();
+
+template<typename U> int e = non_trivial();
+template<typename U> inline int f = non_trivial();
+template<typename U> thread_local int g = non_trivial();
+template<typename U> inline thread_local int h = non_trivial();
+
+inline int unused = 123; // should not be emitted
+
+template<typename T> struct X {
+ static int a;
+ static inline int b = non_trivial();
+ static thread_local int c;
+ static inline thread_local int d = non_trivial();
+
+ template<typename U> static int e;
+ template<typename U> static inline int f = non_trivial();
+ template<typename U> static thread_local int g;
+ template<typename U> static inline thread_local int h = non_trivial();
+
+ static inline int unused = 123; // should not be emitted
+};
+
+template<typename T> int X<T>::a = non_trivial();
+template<typename T> thread_local int X<T>::c = non_trivial();
+template<typename T> template<typename U> int X<T>::e = non_trivial();
+template<typename T> template<typename U> thread_local int X<T>::g =
non_trivial();
+
+inline void use(bool b, ...) {
+ if (b) return;
+ use(true, e<int>, f<int>, g<int>, h<int>,
+ X<int>::a, X<int>::b, X<int>::c, X<int>::d,
+ X<int>::e<int>, X<int>::f<int>, X<int>::g<int>, X<int>::h<int>);
+}
+
+#pragma clang module end
+#pragma clang module endbuild
+#endif
#if IMPORT == 1
// Import the module and the m.a submodule; runs the ordered initializers and
From 09c37acc1466a4680de0bcbedff7c0012d3e8969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Manuel=20Martinez=20Caama=C3=B1o?= <juama...@amd.com>
Date: Tue, 22 Apr 2025 18:40:37 +0200
Subject: [PATCH 3/4] [Preprocessor] Do not expand macros if the input is
already preprocessed
---
clang/include/clang/Lex/Preprocessor.h | 5 +++++
clang/lib/Frontend/InitPreprocessor.cpp | 7 +++++++
clang/test/Preprocessor/preprocess-cpp-output.c | 3 ++-
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/clang/include/clang/Lex/Preprocessor.h
b/clang/include/clang/Lex/Preprocessor.h
index f2dfd3a349b8b..63774e48a468b 100644
--- a/clang/include/clang/Lex/Preprocessor.h
+++ b/clang/include/clang/Lex/Preprocessor.h
@@ -1831,6 +1831,11 @@ class Preprocessor {
MacroExpansionInDirectivesOverride = true;
}
+ void SetDisableMacroExpansion() {
+ DisableMacroExpansion = true;
+ MacroExpansionInDirectivesOverride = false;
+ }
+
/// Peeks ahead N tokens and returns that token without consuming any
/// tokens.
///
diff --git a/clang/lib/Frontend/InitPreprocessor.cpp
b/clang/lib/Frontend/InitPreprocessor.cpp
index 96d6fb64a6319..2840632030919 100644
--- a/clang/lib/Frontend/InitPreprocessor.cpp
+++ b/clang/lib/Frontend/InitPreprocessor.cpp
@@ -1558,6 +1558,13 @@ void clang::InitializePreprocessor(Preprocessor &PP,
const PCHContainerReader &PCHContainerRdr,
const FrontendOptions &FEOpts,
const CodeGenOptions &CodeGenOpts) {
+
+ if (all_of(FEOpts.Inputs,
+ [](const FrontendInputFile &FI) { return FI.isPreprocessed(); }))
{
+ PP.SetDisableMacroExpansion();
+ return;
+ }
+
const LangOptions &LangOpts = PP.getLangOpts();
std::string PredefineBuffer;
PredefineBuffer.reserve(4080);
diff --git a/clang/test/Preprocessor/preprocess-cpp-output.c
b/clang/test/Preprocessor/preprocess-cpp-output.c
index 59ff057e9b871..2c180601e30ac 100644
--- a/clang/test/Preprocessor/preprocess-cpp-output.c
+++ b/clang/test/Preprocessor/preprocess-cpp-output.c
@@ -1,7 +1,8 @@
// RUN: %clang_cc1 -E -x c %s | FileCheck %s --check-prefixes=EXPANDED
-// RUN: %clang_cc1 -E -x cpp-output %s | FileCheck %s --check-prefixes=EXPANDED
+// RUN: %clang_cc1 -E -x cpp-output %s | FileCheck %s
--check-prefixes=NOT-EXPANDED
// EXPANDED: void __attribute__((__attribute__((always_inline)))) foo()
+// NOT-EXPANDED: void __attribute__((always_inline)) foo()
#define always_inline __attribute__((always_inline))
void __attribute__((always_inline)) foo() {
From 9099d6f933e069fe5b6ced8bbfd70c05a5daa785 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Manuel=20Martinez=20Caama=C3=B1o?= <juama...@amd.com>
Date: Thu, 22 May 2025 16:55:40 +0200
Subject: [PATCH 4/4] [Review] Disable macro expansion in BeginSourceFileAction
---
clang/include/clang/Frontend/FrontendAction.h | 2 ++
clang/lib/Frontend/InitPreprocessor.cpp | 6 ------
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/clang/include/clang/Frontend/FrontendAction.h
b/clang/include/clang/Frontend/FrontendAction.h
index 718684a67771a..40a9389bbf81a 100644
--- a/clang/include/clang/Frontend/FrontendAction.h
+++ b/clang/include/clang/Frontend/FrontendAction.h
@@ -84,6 +84,8 @@ class FrontendAction {
/// \return True on success; on failure ExecutionAction() and
/// EndSourceFileAction() will not be called.
virtual bool BeginSourceFileAction(CompilerInstance &CI) {
+ if (CurrentInput.isPreprocessed())
+ CI.getPreprocessor().SetDisableMacroExpansion();
return true;
}
diff --git a/clang/lib/Frontend/InitPreprocessor.cpp
b/clang/lib/Frontend/InitPreprocessor.cpp
index 2840632030919..94d699b9d4521 100644
--- a/clang/lib/Frontend/InitPreprocessor.cpp
+++ b/clang/lib/Frontend/InitPreprocessor.cpp
@@ -1559,12 +1559,6 @@ void clang::InitializePreprocessor(Preprocessor &PP,
const FrontendOptions &FEOpts,
const CodeGenOptions &CodeGenOpts) {
- if (all_of(FEOpts.Inputs,
- [](const FrontendInputFile &FI) { return FI.isPreprocessed(); }))
{
- PP.SetDisableMacroExpansion();
- return;
- }
-
const LangOptions &LangOpts = PP.getLangOpts();
std::string PredefineBuffer;
PredefineBuffer.reserve(4080);
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
