maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

When making a suggestion regarding which module to load rather than 

preprocess/parse a header, report back with an actual module (which
may be a submodule) rather than just the name of the module.

llvm-svn: 144925
This commit is contained in:
Douglas Gregor 2011-11-17 22:44:56 +00:00
parent ee95ed5055
commit c04f644311
5 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clang/include/clang/Lex/DirectoryLookup.h
View File

@ -14,6 +14,7 @@
#ifndef LLVM_CLANG_LEX_DIRECTORYLOOKUP_H
#define LLVM_CLANG_LEX_DIRECTORYLOOKUP_H
#include "clang/Lex/ModuleMap.h"
#include "clang/Basic/LLVM.h"
#include "clang/Basic/SourceManager.h"
@ -144,13 +145,13 @@ public:
/// \param BuildingModule The name of the module we're currently building.
///
/// \param SuggestedModule If non-null, and the file found is semantically
/// part of a known module, this will be set to the name of the module that
/// could be imported instead of preprocessing/parsing the file found.
/// part of a known module, this will be set to the module that should
/// be imported instead of preprocessing/parsing the file found.
const FileEntry *LookupFile(StringRef Filename, HeaderSearch &HS,
SmallVectorImpl<char> *SearchPath,
SmallVectorImpl<char> *RelativePath,
StringRef BuildingModule,
StringRef *SuggestedModule) const;
ModuleMap::Module **SuggestedModule) const;
private:
const FileEntry *DoFrameworkLookup(
@ -158,7 +159,7 @@ private:
SmallVectorImpl<char> *SearchPath,
SmallVectorImpl<char> *RelativePath,
StringRef BuildingModule,
StringRef *SuggestedModule) const;
ModuleMap::Module **SuggestedModule) const;
};

10
clang/include/clang/Lex/HeaderSearch.h
View File

@ -258,15 +258,15 @@ public:
/// Filename for framework includes.
///
/// \param SuggestedModule If non-null, and the file found is semantically
/// part of a known module, this will be set to the name of the module that
/// could be imported instead of preprocessing/parsing the file found.
/// part of a known module, this will be set to the module that should
/// be imported instead of preprocessing/parsing the file found.
const FileEntry *LookupFile(StringRef Filename, bool isAngled,
const DirectoryLookup *FromDir,
const DirectoryLookup *&CurDir,
const FileEntry *CurFileEnt,
SmallVectorImpl<char> *SearchPath,
SmallVectorImpl<char> *RelativePath,
StringRef *SuggestedModule);
ModuleMap::Module **SuggestedModule);
/// LookupSubframeworkHeader - Look up a subframework for the specified
/// #include file. For example, if #include'ing <HIToolbox/HIToolbox.h> from
@ -366,9 +366,7 @@ public:
bool hasModuleMap(StringRef Filename, const DirectoryEntry *Root);
/// \brief Retrieve the module that corresponds to the given file, if any.
///
/// FIXME: This will need to be generalized for submodules.
StringRef findModuleForHeader(const FileEntry *File);
ModuleMap::Module *findModuleForHeader(const FileEntry *File);
/// \brief Read the contents of the given module map file.

2
clang/include/clang/Lex/Preprocessor.h
View File

@ -1008,7 +1008,7 @@ public:
const DirectoryLookup *&CurDir,
SmallVectorImpl<char> *SearchPath,
SmallVectorImpl<char> *RelativePath,
StringRef *SuggestedModule);
ModuleMap::Module **SuggestedModule);
/// GetCurLookup - The DirectoryLookup structure used to find the current
/// FileEntry, if CurLexer is non-null and if applicable. This allows us to

22
clang/lib/Lex/HeaderSearch.cpp
View File

@ -219,7 +219,7 @@ const FileEntry *DirectoryLookup::LookupFile(
SmallVectorImpl<char> *SearchPath,
SmallVectorImpl<char> *RelativePath,
StringRef BuildingModule,
StringRef *SuggestedModule) const {
ModuleMap::Module **SuggestedModule) const {
llvm::SmallString<1024> TmpDir;
if (isNormalDir()) {
// Concatenate the requested file onto the directory.
@ -245,8 +245,8 @@ const FileEntry *DirectoryLookup::LookupFile(
// If there is a module that corresponds to this header,
// suggest it.
StringRef Module = HS.findModuleForHeader(File);
if (!Module.empty() && Module != BuildingModule)
ModuleMap::Module *Module = HS.findModuleForHeader(File);
if (Module && Module->getTopLevelModuleName() != BuildingModule)
*SuggestedModule = Module;
return File;
@ -285,7 +285,7 @@ const FileEntry *DirectoryLookup::DoFrameworkLookup(
SmallVectorImpl<char> *SearchPath,
SmallVectorImpl<char> *RelativePath,
StringRef BuildingModule,
StringRef *SuggestedModule) const
ModuleMap::Module **SuggestedModule) const
{
FileManager &FileMgr = HS.getFileMgr();
@ -370,7 +370,7 @@ const FileEntry *DirectoryLookup::DoFrameworkLookup(
if (const FileEntry *FE = FileMgr.getFile(FrameworkName.str(),
/*openFile=*/!AutomaticImport)) {
if (AutomaticImport)
*SuggestedModule = Module->Name;
*SuggestedModule = Module;
return FE;
}
@ -385,7 +385,7 @@ const FileEntry *DirectoryLookup::DoFrameworkLookup(
const FileEntry *FE = FileMgr.getFile(FrameworkName.str(),
/*openFile=*/!AutomaticImport);
if (FE && AutomaticImport)
*SuggestedModule = Module->Name;
*SuggestedModule = Module;
return FE;
}
@ -408,10 +408,10 @@ const FileEntry *HeaderSearch::LookupFile(
const FileEntry *CurFileEnt,
SmallVectorImpl<char> *SearchPath,
SmallVectorImpl<char> *RelativePath,
StringRef *SuggestedModule)
ModuleMap::Module **SuggestedModule)
{
if (SuggestedModule)
*SuggestedModule = StringRef();
*SuggestedModule = 0;
// If 'Filename' is absolute, check to see if it exists and no searching.
if (llvm::sys::path::is_absolute(Filename)) {
@ -806,11 +806,11 @@ bool HeaderSearch::hasModuleMap(StringRef FileName,
return false;
}
StringRef HeaderSearch::findModuleForHeader(const FileEntry *File) {
ModuleMap::Module *HeaderSearch::findModuleForHeader(const FileEntry *File) {
if (ModuleMap::Module *Module = ModMap.findModuleForHeader(File))
return Module->getTopLevelModuleName();
return Module;
return StringRef();
return 0;
}
bool HeaderSearch::loadModuleMapFile(const FileEntry *File) {

12
clang/lib/Lex/PPDirectives.cpp
View File

@ -486,7 +486,7 @@ const FileEntry *Preprocessor::LookupFile(
const DirectoryLookup *&CurDir,
SmallVectorImpl<char> *SearchPath,
SmallVectorImpl<char> *RelativePath,
StringRef *SuggestedModule) {
ModuleMap::Module **SuggestedModule) {
// If the header lookup mechanism may be relative to the current file, pass in
// info about where the current file is.
const FileEntry *CurFileEnt = 0;
@ -1269,7 +1269,7 @@ void Preprocessor::HandleIncludeDirective(SourceLocation HashLoc,
llvm::SmallString<1024> RelativePath;
// We get the raw path only if we have 'Callbacks' to which we later pass
// the path.
StringRef SuggestedModule;
ModuleMap::Module *SuggestedModule = 0;
const FileEntry *File = LookupFile(
Filename, isAngled, LookupFrom, CurDir,
Callbacks ? &SearchPath : NULL, Callbacks ? &RelativePath : NULL,
@ -1277,9 +1277,13 @@ void Preprocessor::HandleIncludeDirective(SourceLocation HashLoc,
// If we are supposed to import a module rather than including the header,
// do so now.
if (!SuggestedModule.empty()) {
if (SuggestedModule) {
// FIXME: Actually load the submodule that we were given.
while (SuggestedModule->Parent)
SuggestedModule = SuggestedModule->Parent;
TheModuleLoader.loadModule(IncludeTok.getLocation(),
Identifiers.get(SuggestedModule),
Identifiers.get(SuggestedModule->Name),
FilenameTok.getLocation());
return;
}