Commit 8e9e433a authored by Duncan P. N. Exon Smith's avatar Duncan P. N. Exon Smith
Browse files

clang/Modules: Remove unused parameter from ModuleManager::removeModules 

The other paremeters appear to be sufficient to determine which modules
have just been loaded and need to be removed, so stop collecting and
sending in that set explicitly.
parent 7874db75

clang/include/clang/Serialization/ModuleManager.h

+1 −3
Original line number Diff line number Diff line
@@ -255,9 +255,7 @@ public: 
                            std::string &ErrorStr);



  /// Remove the modules starting from First (to the end).

  void removeModules(ModuleIterator First,

                     llvm::SmallPtrSetImpl<ModuleFile *> &LoadedSuccessfully,

                     ModuleMap *modMap);

  void removeModules(ModuleIterator First, ModuleMap *modMap);



  /// Add an in-memory buffer the list of known buffers

  void addInMemoryBuffer(StringRef FileName,

clang/lib/Serialization/ASTReader.cpp

+1 −5
Original line number Diff line number Diff line
@@ -4185,11 +4185,7 @@ ASTReader::ASTReadResult ASTReader::ReadAST(StringRef FileName, 
  case VersionMismatch:

  case ConfigurationMismatch:

  case HadErrors: {

    llvm::SmallPtrSet<ModuleFile *, 4> LoadedSet;

    for (const ImportedModule &IM : Loaded)

      LoadedSet.insert(IM.Mod);



    ModuleMgr.removeModules(ModuleMgr.begin() + NumModules, LoadedSet,

    ModuleMgr.removeModules(ModuleMgr.begin() + NumModules,

                            PP.getLangOpts().Modules

                                ? &PP.getHeaderSearchInfo().getModuleMap()

                                : nullptr);

clang/lib/Serialization/ModuleManager.cpp

+1 −4
Original line number Diff line number Diff line
@@ -219,10 +219,7 @@ ModuleManager::addModule(StringRef FileName, ModuleKind Type, 
  return NewlyLoaded;

}



void ModuleManager::removeModules(

    ModuleIterator First,

    llvm::SmallPtrSetImpl<ModuleFile *> &LoadedSuccessfully,

    ModuleMap *modMap) {

void ModuleManager::removeModules(ModuleIterator First, ModuleMap *modMap) {

  auto Last = end();

  if (First == Last)

    return;