-
Notifications
You must be signed in to change notification settings - Fork 11.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[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
- Loading branch information
Showing
2 changed files
with
55 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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; |