Merge pull request #85519 from adrian-prantl/unregister-api

[LLDB] Add an API for unregistering MemoryBuffer modules (NFC)

Author: adrian-prantl

include/swift/Serialization/SerializedModuleLoader.h

@@ -373,11 +373,14 @@ class MemoryBufferSerializedModuleLoader : public SerializedModuleLoaderBase {
   /// FIXME: make this an actual import *path* once submodules are designed.
   bool registerMemoryBuffer(StringRef importPath,
                             std::unique_ptr<llvm::MemoryBuffer> input,
-                            llvm::VersionTuple version) {
-    return MemoryBuffers
-        .insert({importPath, MemoryBufferInfo(std::move(input), version)})
-        .second;
-  }
+                            llvm::VersionTuple version);
+
+  /// During the transtion to explicitly tracked module dependencies LLDB may
+  /// instruct this loader to forget one of the (now redundant) MemoryBuffers
+  /// because it found an explicit module file on disk.
+  ///
+  /// \return true if the importPath existed.
+  bool unregisterMemoryBuffer(StringRef importPath);
 
   void collectVisibleTopLevelModuleNames(
       SmallVectorImpl<Identifier> &names) const override {}

lib/Serialization/SerializedModuleLoader.cpp

@@ -1708,6 +1708,19 @@ MemoryBufferSerializedModuleLoader::loadModule(SourceLoc importLoc,
   return M;
 }
 
+bool MemoryBufferSerializedModuleLoader::registerMemoryBuffer(
+    StringRef importPath, std::unique_ptr<llvm::MemoryBuffer> input,
+    llvm::VersionTuple version) {
+  return MemoryBuffers
+      .insert({importPath, MemoryBufferInfo(std::move(input), version)})
+      .second;
+}
+
+bool MemoryBufferSerializedModuleLoader::unregisterMemoryBuffer(
+    StringRef importPath) {
+  return MemoryBuffers.erase(importPath);
+}
+
 void SerializedModuleLoaderBase::loadExtensions(NominalTypeDecl *nominal,
                                                 unsigned previousGeneration) {
   for (auto &modulePair : LoadedModuleFiles) {