Author: Michael Spencer Date: 2023-02-01T15:17:32-08:00 New Revision: ffa2a647c6a9dd2fab13a5e1bd4832b5b200d908
URL: https://github.com/llvm/llvm-project/commit/ffa2a647c6a9dd2fab13a5e1bd4832b5b200d908 DIFF: https://github.com/llvm/llvm-project/commit/ffa2a647c6a9dd2fab13a5e1bd4832b5b200d908.diff LOG: [Clang][DependencyScanner] Remove secondary actions from -cc1 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. Differential Revision: https://reviews.llvm.org/D143040 Added: clang/test/ClangScanDeps/strip-input-args.m Modified: clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp Removed: ################################################################################ diff --git a/clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp b/clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp index eeeb5c265a7a..1130c2bc21de 100644 --- a/clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp +++ b/clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp @@ -111,6 +111,9 @@ ModuleDepCollector::makeInvocationForModuleBuildWithoutOutputs( 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; diff --git a/clang/test/ClangScanDeps/strip-input-args.m b/clang/test/ClangScanDeps/strip-input-args.m new file mode 100644 index 000000000000..e1954ecc2891 --- /dev/null +++ b/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": "A" +// 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 +@import A; + +//--- t2.m +@import A; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
