diff options
| -rw-r--r-- | lib/Support/Unix/Path.inc | 12 | ||||
| -rw-r--r-- | test/MC/ELF/comp-dir.s | 10 |
2 files changed, 22 insertions, 0 deletions
diff --git a/lib/Support/Unix/Path.inc b/lib/Support/Unix/Path.inc index 4dcfa09..f6a137e 100644 --- a/lib/Support/Unix/Path.inc +++ b/lib/Support/Unix/Path.inc @@ -298,6 +298,18 @@ UniqueID file_status::getUniqueID() const { } error_code current_path(SmallVectorImpl<char> &result) { + result.clear(); + + const char *pwd = ::getenv("PWD"); + llvm::sys::fs::file_status PWDStatus, DotStatus; + if (pwd && llvm::sys::path::is_absolute(pwd) && + !llvm::sys::fs::status(pwd, PWDStatus) && + !llvm::sys::fs::status(".", DotStatus) && + PWDStatus.getUniqueID() == DotStatus.getUniqueID()) { + result.append(pwd, pwd + strlen(pwd)); + return error_code::success(); + } + #ifdef MAXPATHLEN result.reserve(MAXPATHLEN); #else diff --git a/test/MC/ELF/comp-dir.s b/test/MC/ELF/comp-dir.s index 59e3d7d..1b91f64 100644 --- a/test/MC/ELF/comp-dir.s +++ b/test/MC/ELF/comp-dir.s @@ -1,7 +1,17 @@ +// REQUIRES: shell +// XFAIL: mingw // RUN: llvm-mc -triple=x86_64-linux-unknown -g -fdebug-compilation-dir=/test/comp/dir %s -filetype=obj -o %t.o // RUN: llvm-dwarfdump -debug-dump=info %t.o | FileCheck %s // CHECK: DW_AT_comp_dir [DW_FORM_string] ("{{([A-Za-z]:.*)?}}/test/comp/dir") +// RUN: mkdir -p %t.foo +// RUN: ln -sf %t.foo %t.bar +// RUN: cd %t.foo +// RUN: env PWD=%t.bar llvm-mc -triple=x86_64-linux-unknown -g %s -filetype=obj -o %t.o +// RUN: llvm-dwarfdump -debug-dump=info %t.o | FileCheck --check-prefix=PWD %s +// PWD: DW_AT_comp_dir [DW_FORM_string] ("{{.*}}.bar") + + f: nop |