This is an archive of the discontinued LLVM Phabricator instance.

Differential D111444

Revert "[clang] Fix absolute file paths with -fdebug-prefix-map"
ClosedPublic

Authored by keith on Oct 8 2021, 10:39 AM.

Details

Reviewers
None
Commits
rG68e49aea9ac4: Revert "[clang] Fix absolute file paths with -fdebug-prefix-map"
Summary

This reverts commit a23a5967932292b82e9a7e4b37817d1b3f5be5ec.

This broke a windows test https://buildkite.com/llvm-project/premerge-checks/builds/59492#7dad207c-6cbe-40ad-95e4-c48b47fe2527

Diff Detail

Event Timeline

keith requested review of this revision.Oct 8 2021, 10:39 AM
keith created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptOct 8 2021, 10:39 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
This revision was not accepted when it landed; it landed in state Needs Review.Oct 8 2021, 10:40 AM
This revision was landed with ongoing or failed builds.
Closed by commit rG68e49aea9ac4: Revert "[clang] Fix absolute file paths with -fdebug-prefix-map" (authored by keith). · Explain Why
This revision was automatically updated to reflect the committed changes.
keith added a commit: rG68e49aea9ac4: Revert "[clang] Fix absolute file paths with -fdebug-prefix-map".
Harbormaster completed remote builds in B127827: Diff 378300.Oct 8 2021, 11:11 AM
keith added a reverting change: D111587: re-land: [clang] Fix absolute file paths with -fdebug-prefix-map.Oct 11 2021, 5:01 PM

Revision Contents

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

Diff 378302

clang/lib/CodeGen/CGDebugInfo.cpp

Show First 20 Lines • Show All 440 Lines • ▼ Show 20 Lines if (std::distance(llvm::sys::path::begin(CurDir), CurDirIt) == 1) {
Dir = {}; Dir = {};
File = RemappedFile; File = RemappedFile;
} else { } else {
for (; FileIt != FileE; ++FileIt) for (; FileIt != FileE; ++FileIt)
llvm::sys::path::append(FileBuf, *FileIt); llvm::sys::path::append(FileBuf, *FileIt);
Dir = DirBuf; Dir = DirBuf;
File = FileBuf; File = FileBuf;
} }
} else if (llvm::sys::path::is_absolute(FileName)) {
Dir = llvm::sys::path::parent_path(RemappedFile);
File = llvm::sys::path::filename(RemappedFile);
} else { } else {
Dir = CurDir; Dir = CurDir;
File = RemappedFile; File = RemappedFile;
} }
llvm::DIFile *F = DBuilder.createFile(File, Dir, CSInfo, Source); llvm::DIFile *F = DBuilder.createFile(File, Dir, CSInfo, Source);
DIFileCache[FileName.data()].reset(F); DIFileCache[FileName.data()].reset(F);
return F; return F;
} }
▲ Show 20 Lines • Show All 4,987 Lines • Show Last 20 Lines

clang/test/CodeGen/relative-debug-prefix-map.c

  • This file was deleted.
// RUN: mkdir -p %t.nested/dir && cd %t.nested/dir
// RUN: cp %s %t.nested/dir/main.c
// RUN: %clang_cc1 -debug-info-kind=standalone -fdebug-prefix-map=%t.nested=. %t.nested/dir/main.c -emit-llvm -o - | FileCheck %s
//
// RUN: %clang_cc1 -debug-info-kind=standalone -fdebug-prefix-map=%p=. %s -emit-llvm -o - | FileCheck %s --check-prefix=CHECK-DIRECT
//
// RUN: cd %p
// RUN: %clang_cc1 -debug-info-kind=standalone -fdebug-compilation-dir=. relative-debug-prefix-map.c -emit-llvm -o - | FileCheck %s --check-prefix=CHECK-DIRECT
// CHECK: !DIFile(filename: "main.c", directory: "./dir")
// CHECK-DIRECT: !DIFile(filename: "relative-debug-prefix-map.c", directory: ".")
int main(int argc, char **argv) {
(void)argc;
(void)argv;
return 0;
}
clang/lib/CodeGen/CGDebugInfo.cpp