[PATCH] D143040: [Clang][DependencyScanner] Remove secondary actions from -cc1
Michael Spencer via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Tue Jan 31 17:55:41 PST 2023
Bigcheese created this revision.
Bigcheese added a reviewer: jansvoboda11.
Bigcheese added a project: clang.
Herald added a subscriber: ributzka.
Herald added a project: All.
Bigcheese requested review of this revision.
The -arcmt-action= and -objcmt-migrate* actions were being passed to
module builds. This caused these builds to fail, as they are secondary
actions that suppress emitting modules.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D143040
Files:
clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp
clang/test/ClangScanDeps/strip-input-args.m
Index: clang/test/ClangScanDeps/strip-input-args.m
===================================================================
--- /dev/null
+++ clang/test/ClangScanDeps/strip-input-args.m
@@ -0,0 +1,52 @@
+// RUN: rm -rf %t
+// RUN: split-file %s %t
+// RUN: sed -e "s|DIR|%/t|g" %t/cdb1.json.template > %t/cdb1.json
+
+// RUN: clang-scan-deps -compilation-database %t/cdb1.json -format experimental-full -mode preprocess-dependency-directives > %t/result1.txt
+
+// RUN: FileCheck %s -input-file %t/result1.txt
+
+// Verify that secondary actions get stripped, and that there's a single version
+// of module A.
+
+// CHECK: "modules": [
+// CHECK-NEXT: {
+// CHECK: "command-line": [
+// CHECK-NOT: "-arcmt-action=check"
+// CHECK-NOT: "-objcmt-migrate-literals"
+// CHECK-NOT: "-mt-migrate-directory"
+// CHECK: ]
+// CHECK: "name": "A"
+// CHECK: }
+// CHECK-NOT: "name"
+// CHECK: "translation-units"
+
+//--- cdb1.json.template
+[
+ {
+ "directory": "DIR",
+ "command": "clang -Imodules/A -fmodules -fmodules-cache-path=DIR/module-cache -fimplicit-modules -fimplicit-module-maps -ccc-arcmt-check -fsyntax-only DIR/t1.m",
+ "file": "DIR/t1.m"
+ },
+ {
+ "directory": "DIR",
+ "command": "clang -Imodules/A -fmodules -fmodules-cache-path=DIR/module-cache -fimplicit-modules -fimplicit-module-maps -ccc-objcmt-migrate bob -fsyntax-only DIR/t2.m",
+ "file": "DIR/t2.m"
+ }
+]
+
+//--- modules/A/module.modulemap
+
+module A {
+ umbrella header "A.h"
+}
+
+//--- modules/A/A.h
+
+typedef int A_t;
+
+//--- t1.m
+ at import A;
+
+//--- t2.m
+ at import A;
Index: clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp
===================================================================
--- clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp
+++ clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp
@@ -111,6 +111,9 @@
CI.getDependencyOutputOpts().Targets.clear();
CI.getFrontendOpts().ProgramAction = frontend::GenerateModule;
+ CI.getFrontendOpts().ARCMTAction = FrontendOptions::ARCMT_None;
+ CI.getFrontendOpts().ObjCMTAction = FrontendOptions::ObjCMT_None;
+ CI.getFrontendOpts().MTMigrateDir.clear();
CI.getLangOpts()->ModuleName = Deps.ID.ModuleName;
CI.getFrontendOpts().IsSystemModule = Deps.IsSystem;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D143040.493799.patch
Type: text/x-patch
Size: 2352 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20230201/24ba9615/attachment.bin>
More information about the cfe-commits
mailing list