https://github.com/ributzka updated
https://github.com/llvm/llvm-project/pull/78816
>From 968941561e08424ecb4fb15615ee46fe8356405e Mon Sep 17 00:00:00 2001
From: Juergen Ributzka <juer...@ributzka.de>
Date: Fri, 19 Jan 2024 16:10:03 -0800
Subject: [PATCH 1/2] [clang][modules] Fix CodeGen options that can affect the
AST.
`OptimizationLevel` and `OptimizeSize` can affect the generated AST. They
indirectly affect the `Optimize` and `OptimizeSize` frontend options, which in
turn set predefined macro definitions.
This fixes rdar://121228252.
---
clang/include/clang/Basic/CodeGenOptions.def | 14 ++++++++++++--
clang/lib/Basic/CodeGenOptions.cpp | 2 ++
clang/test/ClangScanDeps/strip-codegen-args.m | 11 +++++++----
3 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/clang/include/clang/Basic/CodeGenOptions.def
b/clang/include/clang/Basic/CodeGenOptions.def
index 2c4fb6745bc172f..f535291b6ba4ee0 100644
--- a/clang/include/clang/Basic/CodeGenOptions.def
+++ b/clang/include/clang/Basic/CodeGenOptions.def
@@ -12,6 +12,9 @@
// that have enumeration type and VALUE_CODEGENOPT is a code
// generation option that describes a value rather than a flag.
//
+// AFFECTING_VALUE_CODEGENOPT is used for code generation options that can
+// affect the AST.
+//
//===----------------------------------------------------------------------===//
#ifndef CODEGENOPT
# error Define the CODEGENOPT macro to handle language options
@@ -27,6 +30,11 @@ CODEGENOPT(Name, Bits, Default)
CODEGENOPT(Name, Bits, Default)
#endif
+#ifndef AFFECTING_VALUE_CODEGENOPT
+# define AFFECTING_VALUE_CODEGENOPT(Name, Bits, Default) \
+VALUE_CODEGENOPT(Name, Bits, Default)
+#endif
+
CODEGENOPT(DisableIntegratedAS, 1, 0) ///< -no-integrated-as
CODEGENOPT(RelaxELFRelocations, 1, 1) ///< -Wa,-mrelax-relocations={yes,no}
CODEGENOPT(AsmVerbose , 1, 0) ///< -dA, -fverbose-asm.
@@ -193,8 +201,10 @@ ENUM_CODEGENOPT(ObjCDispatchMethod,
ObjCDispatchMethodKind, 2, Legacy)
CODEGENOPT(ObjCConvertMessagesToRuntimeCalls , 1, 1)
CODEGENOPT(ObjCAvoidHeapifyLocalBlocks, 1, 0)
-VALUE_CODEGENOPT(OptimizationLevel, 2, 0) ///< The -O[0-3] option specified.
-VALUE_CODEGENOPT(OptimizeSize, 2, 0) ///< If -Os (==1) or -Oz (==2) is
specified.
+
+// The optimization options affect frontend options, whicn in turn do affect
the AST.
+AFFECTING_VALUE_CODEGENOPT(OptimizationLevel, 2, 0) ///< The -O[0-3] option
specified.
+AFFECTING_VALUE_CODEGENOPT(OptimizeSize, 2, 0) ///< If -Os (==1) or -Oz (==2)
is specified.
CODEGENOPT(AtomicProfileUpdate , 1, 0) ///< Set -fprofile-update=atomic
/// Choose profile instrumenation kind or no instrumentation.
diff --git a/clang/lib/Basic/CodeGenOptions.cpp
b/clang/lib/Basic/CodeGenOptions.cpp
index 182d0a2fa4d88f2..79d715305ef20b7 100644
--- a/clang/lib/Basic/CodeGenOptions.cpp
+++ b/clang/lib/Basic/CodeGenOptions.cpp
@@ -27,6 +27,8 @@ void CodeGenOptions::resetNonModularOptions(StringRef
ModuleFormat) {
#define ENUM_DEBUGOPT(Name, Type, Bits, Default)
#define CODEGENOPT(Name, Bits, Default) Name = Default;
#define ENUM_CODEGENOPT(Name, Type, Bits, Default) set##Name(Default);
+// Do not reset AST affecting code generation options.
+#define AFFECTING_VALUE_CODEGENOPT(Name, Bits, Default)
#include "clang/Basic/CodeGenOptions.def"
// Next reset all debug options that can always be reset, because they never
diff --git a/clang/test/ClangScanDeps/strip-codegen-args.m
b/clang/test/ClangScanDeps/strip-codegen-args.m
index bb7e76e86aa2f92..71171f4983386dc 100644
--- a/clang/test/ClangScanDeps/strip-codegen-args.m
+++ b/clang/test/ClangScanDeps/strip-codegen-args.m
@@ -5,11 +5,14 @@
// RUN: clang-scan-deps -compilation-database %t/cdb1.json -format
experimental-full > %t/result1.txt
// RUN: FileCheck %s -input-file %t/result1.txt
-// This tests that codegen option that do not affect the AST or generation of
a module are removed.
+// This tests that codegen option that do not affect the AST or generation of a
+// module are removed. It also tests that the optimization options that affect
+// the AST are not reset to -O0.
// CHECK: "modules": [
// CHECK-NEXT: {
// CHECK: "command-line": [
+// CHECK-NOT: "-O0"
// CHECK-NOT: "-flto"
// CHECK-NOT: "-fno-autolink"
// CHECK-NOT: "-mrelax-relocations=no"
@@ -23,17 +26,17 @@
[
{
"directory": "DIR",
- "command": "clang -Imodules/A -fmodules
-fmodules-cache-path=DIR/module-cache -fimplicit-modules -flto -fno-autolink
-Xclang -mrelax-relocations=no -fsyntax-only DIR/t1.m",
+ "command": "clang -Imodules/A -fmodules
-fmodules-cache-path=DIR/module-cache -fimplicit-modules -O2 -flto
-fno-autolink -Xclang -mrelax-relocations=no -fsyntax-only DIR/t1.m",
"file": "DIR/t1.m"
},
{
"directory": "DIR",
- "command": "clang -Imodules/A -fmodules
-fmodules-cache-path=DIR/module-cache -fimplicit-modules -flto=thin -fautolink
-fsyntax-only DIR/t2.m",
+ "command": "clang -Imodules/A -fmodules
-fmodules-cache-path=DIR/module-cache -fimplicit-modules -O2 -flto=thin
-fautolink -fsyntax-only DIR/t2.m",
"file": "DIR/t2.m"
},
{
"directory": "DIR",
- "command": "clang -Imodules/A -fmodules
-fmodules-cache-path=DIR/module-cache -fimplicit-modules -flto=full
-fsyntax-only DIR/t3.m",
+ "command": "clang -Imodules/A -fmodules
-fmodules-cache-path=DIR/module-cache -fimplicit-modules -O2 -flto=full
-fsyntax-only DIR/t3.m",
"file": "DIR/t2.m"
}
]
>From e7e50c6a11d50e4d3007af4aba445f93b77700ea Mon Sep 17 00:00:00 2001
From: Juergen Ributzka <juer...@ributzka.de>
Date: Fri, 19 Jan 2024 16:22:56 -0800
Subject: [PATCH 2/2] Add missing #undef.
---
clang/include/clang/Basic/CodeGenOptions.def | 1 +
1 file changed, 1 insertion(+)
diff --git a/clang/include/clang/Basic/CodeGenOptions.def
b/clang/include/clang/Basic/CodeGenOptions.def
index f535291b6ba4ee0..2f2e45d5cf63dfa 100644
--- a/clang/include/clang/Basic/CodeGenOptions.def
+++ b/clang/include/clang/Basic/CodeGenOptions.def
@@ -447,3 +447,4 @@ CODEGENOPT(CtorDtorReturnThis, 1, 0)
#undef CODEGENOPT
#undef ENUM_CODEGENOPT
#undef VALUE_CODEGENOPT
+#undef AFFECTING_VALUE_CODEGENOPT
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
