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

Hopefully fixes test failures for msvc. 

Looks like llvm::sys::path::filename() was canonicalizing my paths
before emitting them for FileCheck to stumble over.

Fix a style nit with r219460 while I'm at it.

llvm-svn: 219464
This commit is contained in:
Dan Albert 2014-10-10 02:26:00 +00:00
parent d30d8f4658
commit a4ec57c2c5
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang/lib/Driver/Tools.cpp
View File

@ -3242,8 +3242,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
if (Output.isFilename()) {
CmdArgs.push_back("-coverage-file");
SmallString<128> CoverageFilename;
Arg *FinalOutput = C.getArgs().getLastArg(options::OPT_o);
if (FinalOutput) {
if (Arg *FinalOutput = C.getArgs().getLastArg(options::OPT_o)) {
CoverageFilename = FinalOutput->getValue();
} else {
CoverageFilename = llvm::sys::path::filename(Output.getBaseInput());

8
clang/test/Driver/clang_f_opts.c
View File

@ -78,10 +78,10 @@
// RUN: %clang -### -S -fprofile-arcs -no-integrated-as %s -o foo/bar.o 2>&1 | FileCheck -check-prefix=CHECK-GCNO-LOCATION-REL-PATH %s
// RUN: %clang -### -c -fprofile-arcs %s -o foo/bar.o 2>&1 | FileCheck -check-prefix=CHECK-GCNO-LOCATION-REL-PATH %s
// RUN: %clang -### -c -fprofile-arcs -no-integrated-as %s -o foo/bar.o 2>&1 | FileCheck -check-prefix=CHECK-GCNO-LOCATION-REL-PATH %s
// CHECK-GCNO-DEFAULT-LOCATION: "-coverage-file" "{{.*}}/clang_f_opts.c"
// CHECK-GCNO-DEFAULT-LOCATION-NOT: "-coverage-file" "/tmp/{{.*}}/clang_f_opts.c"
// CHECK-GCNO-LOCATION: "-coverage-file" "/foo/bar.o"
// CHECK-GCNO-LOCATION-REL-PATH: "-coverage-file" "{{.*}}/foo/bar.o"
// CHECK-GCNO-DEFAULT-LOCATION: "-coverage-file" "{{.*}}{{[/\\]}}clang_f_opts.c"
// CHECK-GCNO-DEFAULT-LOCATION-NOT: "-coverage-file" "{{[/\\]}}tmp{{[/\\]}}{{.*}}{{[/\\]}}clang_f_opts.c"
// CHECK-GCNO-LOCATION: "-coverage-file" "{{[/\\]}}foo{{[/\\]}}bar.o"
// CHECK-GCNO-LOCATION-REL-PATH: "-coverage-file" "{{.*}}{{[/\\]}}foo{{[/\\]}}bar.o"
// RUN: %clang -### -S -fvectorize %s 2>&1 | FileCheck -check-prefix=CHECK-VECTORIZE %s
// RUN: %clang -### -S -fno-vectorize -fvectorize %s 2>&1 | FileCheck -check-prefix=CHECK-VECTORIZE %s