summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorBenjamin Kramer <benny.kra@googlemail.com>2015-10-12 09:22:07 +0000
committerBenjamin Kramer <benny.kra@googlemail.com>2015-10-12 09:22:07 +0000
commitc3741ec8d364bb2490cf4abc0d3128cbad51f169 (patch)
tree0624af994afe4d743979710d054131d4bb10d01b /clang/lib
parent6558edcaf5f4fcb1eaed7fccbbe018f7659b25ad (diff)
downloadbcm5719-llvm-c3741ec8d364bb2490cf4abc0d3128cbad51f169.tar.gz
bcm5719-llvm-c3741ec8d364bb2490cf4abc0d3128cbad51f169.zip
[VFS] remove handling of '..' for now.
This can fail badly if we're overlaying a real file system and there are symlinks there. Just keep the path as-is for now. This essentially reverts r249830. llvm-svn: 250021
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Basic/VirtualFileSystem.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Basic/VirtualFileSystem.cpp b/clang/lib/Basic/VirtualFileSystem.cpp
index ced370c6f35..cb09e2ec84f 100644
--- a/clang/lib/Basic/VirtualFileSystem.cpp
+++ b/clang/lib/Basic/VirtualFileSystem.cpp
@@ -497,7 +497,7 @@ void InMemoryFileSystem::addFile(const Twine &P, time_t ModificationTime,
assert(!EC);
(void)EC;
- FileManager::removeDotPaths(Path, /*RemoveDotDot=*/true);
+ FileManager::removeDotPaths(Path, /*RemoveDotDot=*/false);
if (Path.empty())
return;
@@ -556,7 +556,7 @@ lookupInMemoryNode(const InMemoryFileSystem &FS, detail::InMemoryDirectory *Dir,
assert(!EC);
(void)EC;
- FileManager::removeDotPaths(Path, /*RemoveDotDot=*/true);
+ FileManager::removeDotPaths(Path, /*RemoveDotDot=*/false);
if (Path.empty())
return Dir;
OpenPOWER on IntegriCloud