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

Remove unused method canInferFrameworkModule 

llvm-svn: 225801
This commit is contained in:
Ben Langmuir 2015-01-13 17:47:29 +00:00
parent 7d3d50bcb2
commit d3d7f3b5bd
2 changed files with 0 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
clang/include/clang/Lex/ModuleMap.h
View File

@ -331,22 +331,6 @@ public:
bool IsFramework, bool IsFramework,
bool IsExplicit); bool IsExplicit);
/// \brief Determine whether we can infer a framework module a framework
/// with the given name in the given
///
/// \param ParentDir The directory that is the parent of the framework
/// directory.
///
/// \param Name The name of the module.
///
/// \param IsSystem Will be set to 'true' if the inferred module must be a
/// system module.
///
/// \returns true if we are allowed to infer a framework module, and false
/// otherwise.
bool canInferFrameworkModule(const DirectoryEntry *ParentDir,
StringRef Name, bool &IsSystem) const;
/// \brief Infer the contents of a framework module map from the given /// \brief Infer the contents of a framework module map from the given
/// framework directory. /// framework directory.
Module *inferFrameworkModule(StringRef ModuleName, Module *inferFrameworkModule(StringRef ModuleName,

24
clang/lib/Lex/ModuleMap.cpp
View File

@ -563,30 +563,6 @@ ModuleMap::findOrCreateModule(StringRef Name, Module *Parent, bool IsFramework,
return std::make_pair(Result, true); return std::make_pair(Result, true);
} }
bool ModuleMap::canInferFrameworkModule(const DirectoryEntry *ParentDir,
StringRef Name, bool &IsSystem) const {
// Check whether we have already looked into the parent directory
// for a module map.
llvm::DenseMap<const DirectoryEntry *, InferredDirectory>::const_iterator
inferred = InferredDirectories.find(ParentDir);
if (inferred == InferredDirectories.end())
return false;
if (!inferred->second.InferModules)
return false;
// We're allowed to infer for this directory, but make sure it's okay
// to infer this particular module.
bool canInfer = std::find(inferred->second.ExcludedModules.begin(),
inferred->second.ExcludedModules.end(),
Name) == inferred->second.ExcludedModules.end();
if (canInfer && inferred->second.InferSystemModules)
IsSystem = true;
return canInfer;
}
/// \brief For a framework module, infer the framework against which we /// \brief For a framework module, infer the framework against which we
/// should link. /// should link.
static void inferFrameworkLink(Module *Mod, const DirectoryEntry *FrameworkDir, static void inferFrameworkLink(Module *Mod, const DirectoryEntry *FrameworkDir,