Merge commit '5009d66cabff' from apple/stable/20200714 into swift/main

Author: git apple-llvm automerger

lldb/bindings/interface/SBModule.i

@@ -356,6 +356,17 @@ public:
     static uint32_t
     GetNumberAllocatedModules();
 
+    %feature("docstring", "
+    Removes all modules which are no longer needed by any part of LLDB from
+    the module cache.
+
+    This is an implementation detail exposed for testing and should not be
+    relied upon. Use SBDebugger::MemoryPressureDetected instead to reduce
+    LLDB's memory consumption during execution.
+    ") GarbageCollectAllocatedModules;
+    static void
+    GarbageCollectAllocatedModules();
+
     STRING_EXTENSION(SBModule)
 
 #ifdef SWIGPYTHON

lldb/bindings/python/static-binding/LLDBWrapPython.cpp

@@ -40700,6 +40700,22 @@ SWIGINTERN PyObject *_wrap_SBModule_GetNumberAllocatedModules(PyObject *SWIGUNUS
 }
 
 
+SWIGINTERN PyObject *_wrap_SBModule_GarbageCollectAllocatedModules(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  
+  if (!SWIG_Python_UnpackTuple(args, "SBModule_GarbageCollectAllocatedModules", 0, 0, 0)) SWIG_fail;
+  {
+    SWIG_PYTHON_THREAD_BEGIN_ALLOW;
+    lldb::SBModule::GarbageCollectAllocatedModules();
+    SWIG_PYTHON_THREAD_END_ALLOW;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_SBModule___str__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   lldb::SBModule *arg1 = (lldb::SBModule *) 0 ;
@@ -82548,6 +82564,17 @@ static PyMethodDef SwigMethods[] = {
 		"    @return\n"
 		"        The number of modules in the module cache.\n"
 		""},
+	 { "SBModule_GarbageCollectAllocatedModules", _wrap_SBModule_GarbageCollectAllocatedModules, METH_NOARGS, "\n"
+		"SBModule_GarbageCollectAllocatedModules()\n"
+		"\n"
+		"    Removes all modules which are no longer needed by any part of LLDB from\n"
+		"    the module cache.\n"
+		"\n"
+		"    This is an implementation detail exposed for testing and should not be\n"
+		"    relied upon. Use SBDebugger::MemoryPressureDetected instead to reduce\n"
+		"    LLDB's memory consumption during execution.\n"
+		"\n"
+		""},
 	 { "SBModule___str__", _wrap_SBModule___str__, METH_O, "SBModule___str__(SBModule self) -> std::string"},
 	 { "SBModule_swigregister", SBModule_swigregister, METH_O, NULL},
 	 { "SBModule_swiginit", SBModule_swiginit, METH_VARARGS, NULL},

lldb/bindings/python/static-binding/lldb.py

@@ -7484,6 +7484,21 @@ def GetNumberAllocatedModules():
         """
         return _lldb.SBModule_GetNumberAllocatedModules()
 
+    @staticmethod
+    def GarbageCollectAllocatedModules():
+        r"""
+        GarbageCollectAllocatedModules()
+
+            Removes all modules which are no longer needed by any part of LLDB from
+            the module cache.
+
+            This is an implementation detail exposed for testing and should not be
+            relied upon. Use SBDebugger::MemoryPressureDetected instead to reduce
+            LLDB's memory consumption during execution.
+
+        """
+        return _lldb.SBModule_GarbageCollectAllocatedModules()
+
     def __str__(self):
         r"""__str__(SBModule self) -> std::string"""
         return _lldb.SBModule___str__(self)
@@ -7716,6 +7731,20 @@ def SBModule_GetNumberAllocatedModules():
     """
     return _lldb.SBModule_GetNumberAllocatedModules()
 
+def SBModule_GarbageCollectAllocatedModules():
+    r"""
+    SBModule_GarbageCollectAllocatedModules()
+
+        Removes all modules which are no longer needed by any part of LLDB from
+        the module cache.
+
+        This is an implementation detail exposed for testing and should not be
+        relied upon. Use SBDebugger::MemoryPressureDetected instead to reduce
+        LLDB's memory consumption during execution.
+
+    """
+    return _lldb.SBModule_GarbageCollectAllocatedModules()
+
 class SBModuleSpec(object):
     r"""Proxy of C++ lldb::SBModuleSpec class."""
 

lldb/include/lldb/API/SBModule.h

@@ -293,6 +293,9 @@ class LLDB_API SBModule {
   /// Get the number of global modules.
   static uint32_t GetNumberAllocatedModules();
 
+  /// Remove any global modules which are no longer needed.
+  static void GarbageCollectAllocatedModules();
+
 private:
   friend class SBAddress;
   friend class SBFrame;

lldb/packages/Python/lldbsuite/test/lldbtest.py

@@ -1029,6 +1029,18 @@ def tearDown(self):
         lldb.SBDebugger.Destroy(self.dbg)
         del self.dbg
 
+        # All modules should be orphaned now so that they can be cleared from
+        # the shared module cache.
+        lldb.SBModule.GarbageCollectAllocatedModules()
+
+        # Modules are not orphaned during reproducer replay because they're
+        # leaked on purpose.
+        if not configuration.is_reproducer():
+            # Assert that the global module cache is empty.
+            # (rdar://problem/64424164) self.assertEqual(lldb.SBModule.GetNumberAllocatedModules(), 0)
+            pass
+
+
     # =========================================================
     # Various callbacks to allow introspection of test progress
     # =========================================================
@@ -1989,13 +2001,9 @@ def tearDown(self):
         for target in targets:
             self.dbg.DeleteTarget(target)
 
-        # Modules are not orphaned during reproducer replay because they're
-        # leaked on purpose.
         if not configuration.is_reproducer():
             # Assert that all targets are deleted.
-            assert self.dbg.GetNumTargets() == 0
-            # Assert that the global module cache is empty.
-            # (rdar://problem/64424164) assert lldb.SBModule.GetNumberAllocatedModules() == 0
+            self.assertEqual(self.dbg.GetNumTargets(), 0)
 
         # Do this last, to make sure it's in reverse order from how we setup.
         Base.tearDown(self)

lldb/source/API/SBModule.cpp

@@ -714,6 +714,13 @@ uint32_t SBModule::GetNumberAllocatedModules() {
   return Module::GetNumberAllocatedModules();
 }
 
+void SBModule::GarbageCollectAllocatedModules() {
+  LLDB_RECORD_STATIC_METHOD_NO_ARGS(void, SBModule,
+                                    GarbageCollectAllocatedModules);
+  const bool mandatory = false;
+  ModuleList::RemoveOrphanSharedModules(mandatory);
+}
+
 namespace lldb_private {
 namespace repro {