From: Douglas Gregor <dgregor@apple.com>
Date: Fri, 16 Sep 2011 00:22:46 +0000 (+0000)
Subject: Tweak the module auto-import heuristics a bit
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0fd787bb8529ace1cb7af592193ba22d0bab2d36;p=clang

Tweak the module auto-import heuristics a bit

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@139887 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Lex/HeaderSearch.cpp b/lib/Lex/HeaderSearch.cpp
index 8a35080fe0..ca641d4c0d 100644
--- a/lib/Lex/HeaderSearch.cpp
+++ b/lib/Lex/HeaderSearch.cpp
@@ -289,7 +289,8 @@ const FileEntry *DirectoryLookup::DoFrameworkLookup(
 
   /// Determine whether this is the module we're building or not.
   bool AutomaticImport = SuggestedModule &&
-    (BuildingModule != StringRef(Filename.begin(), SlashPos));
+    (BuildingModule != StringRef(Filename.begin(), SlashPos)) &&
+    !Filename.substr(SlashPos + 1).startswith("..");
   
   FrameworkName.append(Filename.begin()+SlashPos+1, Filename.end());
   if (const FileEntry *FE = FileMgr.getFile(FrameworkName.str(),