diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2013-08-10 00:50:57 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2013-08-10 00:50:57 +0000 |
| commit | 0a69bac39607c1f715835d951a6deb1c7ecbedfe (patch) | |
| tree | 042b0fa9423ee2565cfdf76c165c26be9c3a0f2a | |
| parent | 3ed7576a3bfd8e4e76e7b8f7ae76422c1ae48f72 (diff) | |
| download | llvm-0a69bac39607c1f715835d951a6deb1c7ecbedfe.tar.gz llvm-0a69bac39607c1f715835d951a6deb1c7ecbedfe.tar.bz2 llvm-0a69bac39607c1f715835d951a6deb1c7ecbedfe.tar.xz | |
Check for $PWD in llvm::sys::current_path.
Some users (clang, libTooling) require this. After this patch we can remove
the calls to getenv("PWD") from clang.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@188125 91177308-0d34-0410-b5e6-96231b3b80d8
| -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 4dcfa094a7..f6a137e7a0 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 59e3d7ded2..1b91f64a50 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 |