diff options
Diffstat (limited to 'lib/Frontend')
| -rw-r--r-- | lib/Frontend/ASTUnit.cpp | 2 | ||||
| -rw-r--r-- | lib/Frontend/CompilerInstance.cpp | 14 | ||||
| -rw-r--r-- | lib/Frontend/FrontendActions.cpp | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/lib/Frontend/ASTUnit.cpp b/lib/Frontend/ASTUnit.cpp index 7436efba41..62c557af43 100644 --- a/lib/Frontend/ASTUnit.cpp +++ b/lib/Frontend/ASTUnit.cpp @@ -2456,7 +2456,7 @@ void ASTUnit::TranslateStoredDiagnostics( SmallVector<StoredDiagnostic, 4> Result; Result.reserve(Diags.size()); assert(MMan && "Don't have a module manager"); - serialization::Module *Mod = MMan->ModuleMgr.lookup(ModName); + serialization::ModuleFile *Mod = MMan->ModuleMgr.lookup(ModName); assert(Mod && "Don't have preamble module"); SLocRemap &Remap = Mod->SLocRemap; for (unsigned I = 0, N = Diags.size(); I != N; ++I) { diff --git a/lib/Frontend/CompilerInstance.cpp b/lib/Frontend/CompilerInstance.cpp index c92d32ac7e..743a447c32 100644 --- a/lib/Frontend/CompilerInstance.cpp +++ b/lib/Frontend/CompilerInstance.cpp @@ -962,7 +962,7 @@ void LockFileManager::waitForUnlock() { /// \brief Compile a module file for the given module, using the options /// provided by the importing compiler instance. static void compileModule(CompilerInstance &ImportingInstance, - ModuleMap::Module *Module, + Module *Module, StringRef ModuleFileName) { LockFileManager Locked(ModuleFileName); switch (Locked) { @@ -1068,8 +1068,8 @@ static void compileModule(CompilerInstance &ImportingInstance, llvm::sys::Path(TempModuleMapFileName).eraseFromDisk(); } -ModuleKey CompilerInstance::loadModule(SourceLocation ImportLoc, - ModuleIdPath Path) { +Module *CompilerInstance::loadModule(SourceLocation ImportLoc, + ModuleIdPath Path) { // If we've already handled this import, just return the cached result. // This one-element cache is important to eliminate redundant diagnostics // when both the preprocessor and parser see the same import declaration. @@ -1087,11 +1087,11 @@ ModuleKey CompilerInstance::loadModule(SourceLocation ImportLoc, StringRef ModuleName = Path[0].first->getName(); SourceLocation ModuleNameLoc = Path[0].second; - ModuleMap::Module *Module = 0; + clang::Module *Module = 0; const FileEntry *ModuleFile = 0; // If we don't already have information on this module, load the module now. - llvm::DenseMap<const IdentifierInfo *, ModuleMap::Module *>::iterator Known + llvm::DenseMap<const IdentifierInfo *, clang::Module *>::iterator Known = KnownModules.find(Path[0].first); if (Known == KnownModules.end()) { // Search for a module with the given name. @@ -1206,7 +1206,7 @@ ModuleKey CompilerInstance::loadModule(SourceLocation ImportLoc, if (Path.size() > 1) { for (unsigned I = 1, N = Path.size(); I != N; ++I) { StringRef Name = Path[I].first->getName(); - llvm::StringMap<ModuleMap::Module *>::iterator Pos + llvm::StringMap<clang::Module *>::iterator Pos = Module->SubModules.find(Name); if (Pos == Module->SubModules.end()) { @@ -1214,7 +1214,7 @@ ModuleKey CompilerInstance::loadModule(SourceLocation ImportLoc, llvm::SmallVector<StringRef, 2> Best; unsigned BestEditDistance = (std::numeric_limits<unsigned>::max)(); - for (llvm::StringMap<ModuleMap::Module *>::iterator + for (llvm::StringMap<clang::Module *>::iterator J = Module->SubModules.begin(), JEnd = Module->SubModules.end(); J != JEnd; ++J) { diff --git a/lib/Frontend/FrontendActions.cpp b/lib/Frontend/FrontendActions.cpp index 0cbcde5bda..5c4e447ef5 100644 --- a/lib/Frontend/FrontendActions.cpp +++ b/lib/Frontend/FrontendActions.cpp @@ -131,7 +131,7 @@ ASTConsumer *GenerateModuleAction::CreateASTConsumer(CompilerInstance &CI, /// \param Module The module we're collecting includes from. /// \param ExplicitOnly Whether we should only add headers from explicit static void collectModuleHeaderIncludes(const LangOptions &LangOpts, - ModuleMap::Module *Module, + clang::Module *Module, bool ExplicitOnly, llvm::SmallString<256> &Includes) { if (!ExplicitOnly || Module->IsExplicit) { @@ -147,7 +147,7 @@ static void collectModuleHeaderIncludes(const LangOptions &LangOpts, } // Recurse into submodules. - for (llvm::StringMap<ModuleMap::Module *>::iterator + for (llvm::StringMap<clang::Module *>::iterator Sub = Module->SubModules.begin(), SubEnd = Module->SubModules.end(); Sub != SubEnd; ++Sub) { |