This is an archive of the discontinued LLVM Phabricator instance.

Differential D97001

[Coverage] Normalize compilation dir as well
ClosedPublic

Authored by phosek on Feb 18 2021, 3:02 PM.

Details

Reviewers
vsk
Commits
rG3275b18f8979: [Coverage] Normalize compilation dir as well
Summary

This matches debug info behavior.

Diff Detail

Event Timeline

phosek requested review of this revision.Feb 18 2021, 3:02 PM
phosek created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptFeb 18 2021, 3:02 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B89810: Diff 324786.Feb 18 2021, 5:17 PM
vsk added a comment.Feb 19 2021, 12:25 PM

Would it be straightforward to test this, like we do other filename encodings in abspath.cpp?

phosek updated this revision to Diff 325099.Feb 19 2021, 3:13 PM

Test added.

vsk accepted this revision.Feb 19 2021, 3:27 PM

Thanks.

This revision is now accepted and ready to land.Feb 19 2021, 3:27 PM
This revision was landed with ongoing or failed builds.Feb 19 2021, 3:29 PM
Closed by commit rG3275b18f8979: [Coverage] Normalize compilation dir as well (authored by phosek). · Explain Why
This revision was automatically updated to reflect the committed changes.
phosek added a commit: rG3275b18f8979: [Coverage] Normalize compilation dir as well.
Harbormaster completed remote builds in B89986: Diff 325099.Feb 19 2021, 3:46 PM

Revision Contents

PathSize
clang/
lib/
CodeGen/
2 lines
test/
Profile/
3 lines

Diff 325099

clang/lib/CodeGen/CoverageMappingGen.cpp

Show First 20 Lines • Show All 1,720 Lines • ▼ Show 20 Lines if (FunctionRecords.empty())
return; return;
llvm::LLVMContext &Ctx = CGM.getLLVMContext(); llvm::LLVMContext &Ctx = CGM.getLLVMContext();
auto *Int32Ty = llvm::Type::getInt32Ty(Ctx); auto *Int32Ty = llvm::Type::getInt32Ty(Ctx);
// Create the filenames and merge them with coverage mappings // Create the filenames and merge them with coverage mappings
llvm::SmallVector<std::string, 16> FilenameStrs; llvm::SmallVector<std::string, 16> FilenameStrs;
FilenameStrs.resize(FileEntries.size() + 1); FilenameStrs.resize(FileEntries.size() + 1);
// The first filename is the current working directory. // The first filename is the current working directory.
FilenameStrs[0] = getCurrentDirname(); FilenameStrs[0] = normalizeFilename(getCurrentDirname());
for (const auto &Entry : FileEntries) { for (const auto &Entry : FileEntries) {
auto I = Entry.second; auto I = Entry.second;
FilenameStrs[I] = normalizeFilename(Entry.first->getName()); FilenameStrs[I] = normalizeFilename(Entry.first->getName());
} }
std::string Filenames; std::string Filenames;
{ {
llvm::raw_string_ostream OS(Filenames); llvm::raw_string_ostream OS(Filenames);
▲ Show 20 Lines • Show All 77 Lines • Show Last 20 Lines

clang/test/Profile/profile-prefix-map.c

Show All 10 Lines
// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -emit-llvm -mllvm -enable-name-compression=false -main-file-name profile-prefix-map.c ../root/nested/profile-prefix-map.c -o - | FileCheck --check-prefix=RELATIVE %s // RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -emit-llvm -mllvm -enable-name-compression=false -main-file-name profile-prefix-map.c ../root/nested/profile-prefix-map.c -o - | FileCheck --check-prefix=RELATIVE %s
// //
// RELATIVE: @__llvm_coverage_mapping = {{.*"\\02.*}}..{{/|\\+}}root{{/|\\+}}nested{{.*profile-prefix-map\.c}} // RELATIVE: @__llvm_coverage_mapping = {{.*"\\02.*}}..{{/|\\+}}root{{/|\\+}}nested{{.*profile-prefix-map\.c}}
// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -emit-llvm -mllvm -enable-name-compression=false -main-file-name profile-prefix-map.c %t/root/nested/profile-prefix-map.c -fprofile-prefix-map=%/t/root=. -o - | FileCheck --check-prefix=PROFILE-PREFIX-MAP %s // RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -emit-llvm -mllvm -enable-name-compression=false -main-file-name profile-prefix-map.c %t/root/nested/profile-prefix-map.c -fprofile-prefix-map=%/t/root=. -o - | FileCheck --check-prefix=PROFILE-PREFIX-MAP %s
// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -emit-llvm -mllvm -enable-name-compression=false -main-file-name profile-prefix-map.c ../root/nested/profile-prefix-map.c -fprofile-prefix-map=../root=. -o - | FileCheck --check-prefix=PROFILE-PREFIX-MAP %s // RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -emit-llvm -mllvm -enable-name-compression=false -main-file-name profile-prefix-map.c ../root/nested/profile-prefix-map.c -fprofile-prefix-map=../root=. -o - | FileCheck --check-prefix=PROFILE-PREFIX-MAP %s
// PROFILE-PREFIX-MAP: @__llvm_coverage_mapping = {{.*"\\02.*}}.{{/|\\+}}nested{{.*profile-prefix-map\.c}} // PROFILE-PREFIX-MAP: @__llvm_coverage_mapping = {{.*"\\02.*}}.{{/|\\+}}nested{{.*profile-prefix-map\.c}}
// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -emit-llvm -mllvm -enable-name-compression=false -main-file-name profile-prefix-map.c %t/root/nested/profile-prefix-map.c -fprofile-compilation-dir=/custom -fprofile-prefix-map=/custom=/nonsense -o - | FileCheck --check-prefix=PROFILE-COMPILATION-DIR %s
// PROFILE-COMPILATION-DIR: @__llvm_coverage_mapping = {{.*"\\02.*}}nonsense