-
Notifications
You must be signed in to change notification settings - Fork 10.8k
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 all warning flags when suppressing …
…warnings (#71612) Since system modules don't emit most warnings, remove the warning flags to increase module reuse.
- Loading branch information
Showing
4 changed files
with
155 additions
and
2 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
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,123 @@ | ||
// This test verifies that system module variants are mergable despite having | ||
// different warning flags, as most warnings are disabled in system modules. | ||
// This checks for system modules marked as such both via `-isystem` and | ||
// `[system]`. | ||
|
||
// RUN: rm -rf %t | ||
// RUN: split-file %s %t | ||
// RUN: sed -e "s|DIR|%/t|g" %t/build/compile-commands.json.in > %t/build/compile-commands.json | ||
// RUN: clang-scan-deps -compilation-database %t/build/compile-commands.json \ | ||
// RUN: -j 1 -format experimental-full -optimize-args=system-warnings > %t/deps.db | ||
// RUN: cat %t/deps.db | sed 's:\\\\\?:/:g' | FileCheck %s -DPREFIX=%/t | ||
|
||
// CHECK: { | ||
// CHECK-NEXT: "modules": [ | ||
// CHECK-NEXT: { | ||
// CHECK-NEXT: "clang-module-deps": [], | ||
// CHECK-NEXT: "clang-modulemap-file": | ||
// CHECK-NEXT: "command-line": [ | ||
// CHECK-NOT: "-W | ||
// CHECK: ], | ||
// CHECK-NEXT: "context-hash": "{{.*}}", | ||
// CHECK-NEXT: "file-deps": [ | ||
// CHECK: ], | ||
// CHECK-NEXT: "name": "A" | ||
// CHECK-NEXT: }, | ||
// CHECK-NEXT: { | ||
// CHECK-NEXT: "clang-module-deps": [], | ||
// CHECK-NEXT: "clang-modulemap-file": | ||
// CHECK-NEXT: "command-line": [ | ||
// CHECK-NOT: "-W | ||
// CHECK: ], | ||
// CHECK-NEXT: "context-hash": "{{.*}}", | ||
// CHECK-NEXT: "file-deps": [ | ||
// CHECK: ], | ||
// CHECK-NEXT: "name": "B" | ||
// CHECK-NEXT: }, | ||
// CHECK-NEXT: { | ||
// CHECK-NEXT: "clang-module-deps": [], | ||
// CHECK-NEXT: "clang-modulemap-file": | ||
// CHECK-NEXT: "command-line": [ | ||
// CHECK: "-Wmaybe-unused | ||
// CHECK: ], | ||
// CHECK-NEXT: "context-hash": "{{.*}}", | ||
// CHECK-NEXT: "file-deps": [ | ||
// CHECK: ], | ||
// CHECK-NEXT: "name": "C" | ||
// CHECK-NEXT: } | ||
// CHECK-NEXT: ], | ||
// CHECK-NEXT: "translation-units": [ | ||
// CHECK: ] | ||
// CHECK: } | ||
|
||
// A.m and B.m verify that system modules with different warning flags get | ||
// merged. C.m verifies that -Wsystem-headers disables the optimization. | ||
//--- build/compile-commands.json.in | ||
|
||
[ | ||
{ | ||
"directory": "DIR", | ||
"command": "clang -c DIR/A.m -isystem modules/A -I modules/B -fmodules -fmodules-cache-path=DIR/module-cache -fimplicit-module-maps", | ||
"file": "DIR/A.m" | ||
}, | ||
{ | ||
"directory": "DIR", | ||
"command": "clang -c DIR/B.m -isystem modules/A -I modules/B -fmodules -fmodules-cache-path=DIR/module-cache -fimplicit-module-maps -Wmaybe-unused", | ||
"file": "DIR/B.m" | ||
}, | ||
{ | ||
"directory": "DIR", | ||
"command": "clang -c DIR/C.m -isystem modules/C -fmodules -fmodules-cache-path=DIR/module-cache -fimplicit-module-maps -Wmaybe-unused -Wsystem-headers", | ||
"file": "DIR/C.m" | ||
} | ||
] | ||
|
||
//--- modules/A/module.modulemap | ||
|
||
module A { | ||
umbrella header "A.h" | ||
} | ||
|
||
//--- modules/A/A.h | ||
|
||
typedef int A_t; | ||
|
||
//--- modules/B/module.modulemap | ||
|
||
module B [system] { | ||
umbrella header "B.h" | ||
} | ||
|
||
//--- modules/B/B.h | ||
|
||
typedef int B_t; | ||
|
||
//--- modules/C/module.modulemap | ||
|
||
module C [system] { | ||
umbrella header "C.h" | ||
} | ||
|
||
//--- modules/C/C.h | ||
|
||
typedef int C_t; | ||
|
||
//--- A.m | ||
|
||
#include <A.h> | ||
#include <B.h> | ||
|
||
A_t a = 0; | ||
|
||
//--- B.m | ||
|
||
#include <A.h> | ||
#include <B.h> | ||
|
||
A_t b = 0; | ||
|
||
//--- C.m | ||
|
||
#include <C.h> | ||
|
||
C_t c = 0; |
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