maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[clang-scan-deps] Improve argument parsing to find target object file path. 

Support the joined version of -o (-ofilepath), and ensure we use the last provided -o option.

Differential Revision: https://reviews.llvm.org/D92330
This commit is contained in:
Sylvain Audi 2020-11-30 11:56:37 -05:00
parent a36bd4c90d
commit 79ba7967f4
3 changed files with 55 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
clang/test/ClangScanDeps/Inputs/target-filename-cdb.json Normal file
View File

@ -0,0 +1,22 @@
[
{
"directory": "DIR",
"command": "clang -E DIR/target-filename_input.cpp",
"file": "DIR/target-filename_input.cpp"
},
{
"directory": "DIR",
"command": "clang -E DIR/target-filename_input.cpp -o a.o",
"file": "DIR/target-filename_input.cpp"
},
{
"directory": "DIR",
"command": "clang -E DIR/target-filename_input.cpp -ob.o",
"file": "DIR/target-filename_input.cpp"
},
{
"directory": "DIR",
"command": "clang -E DIR/target-filename_input.cpp -o first.o -o last.o",
"file": "DIR/target-filename_input.cpp"
}
]

20
clang/test/ClangScanDeps/target-filename.cpp Normal file
View File

@ -0,0 +1,20 @@
// RUN: rm -rf %t.dir
// RUN: rm -rf %t.cdb
// RUN: mkdir -p %t.dir
// RUN: cp %s %t.dir/target-filename_input.cpp
// RUN: mkdir %t.dir/Inputs
// RUN: cp %S/Inputs/header.h %t.dir/Inputs/header.h
// RUN: sed -e "s|DIR|%/t.dir|g" %S/Inputs/target-filename-cdb.json > %t.cdb
// RUN: clang-scan-deps -compilation-database %t.cdb -j 1 | FileCheck %s
// CHECK: target-filename_input.o:
// CHECK-NEXT: target-filename_input.cpp
// CHECK-NEXT: a.o:
// CHECK-NEXT: target-filename_input.cpp
// CHECK-NEXT: b.o:
// CHECK-NEXT: target-filename_input.cpp
// CHECK-NEXT: last.o:
// CHECK-NEXT: target-filename_input.cpp

23
clang/tools/clang-scan-deps/ClangScanDeps.cpp
View File

@ -425,18 +425,21 @@ int main(int argc, const char **argv) {
if (!Args.empty()) {
std::size_t Idx = Args.size() - 1;
for (auto It = Args.rbegin(); It != Args.rend(); ++It) {
if (It != Args.rbegin()) {
if (Args[Idx] == "-o")
StringRef Arg = Args[Idx];
if (LastO.empty()) {
if (Arg == "-o" && It != Args.rbegin())
LastO = Args[Idx + 1];
if (Args[Idx] == "-MT")
HasMT = true;
if (Args[Idx] == "-MQ")
HasMQ = true;
if (Args[Idx] == "-MD")
HasMD = true;
if (Args[Idx] == "-resource-dir")
HasResourceDir = true;
else if (Arg.startswith("-o"))
LastO = Arg.drop_front(2).str();
}
if (Arg == "-MT")
HasMT = true;
if (Arg == "-MQ")
HasMQ = true;
if (Arg == "-MD")
HasMD = true;
if (Arg == "-resource-dir")
HasResourceDir = true;
--Idx;
}
}