Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-11-25 06:40:18 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[Clang][DependencyScanner] Remove secondary actions from -cc1

Browse Source 
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
This commit is contained in:
Michael Spencer 2023-01-31 17:52:51 -08:00
parent 7e566a3d11
commit ffa2a647c6
2 changed files with 55 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp
View File

@ -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;

52
clang/test/ClangScanDeps/strip-input-args.m Normal file
View File

@ -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;