From 3787478a3af97ab543a6a2f2aeb1fdc05e5818cd Mon Sep 17 00:00:00 2001 From: Axel Naumann Date: Tue, 19 Aug 2014 14:12:12 +0200 Subject: [PATCH] Use functionality in master instead of providing our own. --- .../llvm/src/tools/clang/lib/Lex/HeaderSearch.cpp | 27 ++++++---------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/interpreter/llvm/src/tools/clang/lib/Lex/HeaderSearch.cpp b/interpreter/llvm/src/tools/clang/lib/Lex/HeaderSearch.cpp index b23e308..52feed0 100644 --- a/interpreter/llvm/src/tools/clang/lib/Lex/HeaderSearch.cpp +++ b/interpreter/llvm/src/tools/clang/lib/Lex/HeaderSearch.cpp @@ -287,25 +287,10 @@ const FileEntry *DirectoryLookup::LookupFile( RelativePath->clear(); RelativePath->append(Filename.begin(), Filename.end()); } - - // If we have a module map that might map this header, load it and - // check whether we'll have a suggestion for a module. - HS.hasModuleMap(TmpDir, getDir(), isSystemHeaderDirectory()); - if (SuggestedModule) { - const FileEntry *File = HS.getFileMgr().getFile(TmpDir.str(), - /*openFile=*/false); - if (!File) - return File; - - // If there is a module that corresponds to this header, suggest it. - *SuggestedModule = HS.findModuleForHeader(File); - if (!SuggestedModule->getModule() && - HS.hasModuleMap(TmpDir, getDir(), isSystemHeaderDirectory())) - *SuggestedModule = HS.findModuleForHeader(File); - return File; - } - - return HS.getFileMgr().getFile(TmpDir.str(), OpenFile); + + return getFileAndSuggestModule(HS, TmpDir.str(), getDir(), + isSystemHeaderDirectory(), + SuggestedModule); } if (isFramework()) @@ -649,7 +634,9 @@ const FileEntry *HeaderSearch::LookupFile( bool IncluderIsSystemHeader = getFileInfo(Includer).DirInfo != SrcMgr::C_User; if (const FileEntry *FE = - FileMgr.getFile(TmpDir.str(), OpenFile, CacheFailures)) { + getFileAndSuggestModule(*this, TmpDir.str(), Includer->getDir(), + IncluderIsSystemHeader, + SuggestedModule)) { // Leave CurDir unset. // This file is a system header or C++ unfriendly if the old file is. // -- 1.8.2