[lldb] Revert plugin manager changes to investigate failure

Revert the below two commits while we investigate the test failures.

Revert "[lldb] Fix plugin manager test failure on windows (#134173)"

This reverts commit b55bab2.

Revert "Add enable/disable api for SystemRuntime plugins (#133794)"

This reverts commit 2026873.

Author: dmpots

lldb/include/lldb/Core/PluginManager.h

@@ -22,7 +22,6 @@
 
 #include <cstddef>
 #include <cstdint>
-#include <vector>
 
 #define LLDB_PLUGIN_DEFINE_ADV(ClassName, PluginName)                          \
   namespace lldb_private {                                                     \
@@ -48,12 +47,6 @@ class CommandInterpreter;
 class Debugger;
 class StringList;
 
-struct RegisteredPluginInfo {
-  llvm::StringRef name = "";
-  llvm::StringRef description = "";
-  bool enabled = false;
-};
-
 class PluginManager {
 public:
   static void Initialize();
@@ -175,12 +168,6 @@ class PluginManager {
   static SystemRuntimeCreateInstance
   GetSystemRuntimeCreateCallbackAtIndex(uint32_t idx);
 
-  static std::vector<RegisteredPluginInfo> GetSystemRuntimePluginInfo();
-
-  // Modify the enabled state of a SystemRuntime plugin.
-  // Returns false if the plugin name is not found.
-  static bool SetSystemRuntimePluginEnabled(llvm::StringRef name, bool enabled);
-
   // ObjectFile
   static bool
   RegisterPlugin(llvm::StringRef name, llvm::StringRef description,

lldb/source/Core/PluginManager.cpp

@@ -188,13 +188,11 @@ template <typename Callback> struct PluginInstance {
   PluginInstance(llvm::StringRef name, llvm::StringRef description,
                  Callback create_callback,
                  DebuggerInitializeCallback debugger_init_callback = nullptr)
-      : name(name), description(description), enabled(true),
-        create_callback(create_callback),
+      : name(name), description(description), create_callback(create_callback),
         debugger_init_callback(debugger_init_callback) {}
 
   llvm::StringRef name;
   llvm::StringRef description;
-  bool enabled;
   Callback create_callback;
   DebuggerInitializeCallback debugger_init_callback;
 };
@@ -252,9 +250,7 @@ template <typename Instance> class PluginInstances {
   }
 
   void PerformDebuggerCallback(Debugger &debugger) {
-    for (const auto &instance : m_instances) {
-      if (!instance.enabled)
-        continue;
+    for (auto &instance : m_instances) {
       if (instance.debugger_init_callback)
         instance.debugger_init_callback(debugger);
     }
@@ -264,14 +260,7 @@ template <typename Instance> class PluginInstances {
   // Note that this is a copy of the internal state so modifications
   // to the returned instances will not be reflected back to instances
   // stored by the PluginInstances object.
-  std::vector<Instance> GetSnapshot() {
-    std::vector<Instance> enabled_instances;
-    for (const auto &instance : m_instances) {
-      if (instance.enabled)
-        enabled_instances.push_back(instance);
-    }
-    return enabled_instances;
-  }
+  std::vector<Instance> GetSnapshot() { return m_instances; }
 
   const Instance *GetInstanceAtIndex(uint32_t idx) {
     uint32_t count = 0;
@@ -291,41 +280,12 @@ template <typename Instance> class PluginInstances {
   const Instance *
   FindEnabledInstance(std::function<bool(const Instance &)> predicate) const {
     for (const auto &instance : m_instances) {
-      if (!instance.enabled)
-        continue;
       if (predicate(instance))
         return &instance;
     }
     return nullptr;
   }
 
-  // Return a list of all the registered plugin instances. This includes both
-  // enabled and disabled instances. The instances are listed in the order they
-  // were registered which is the order they would be queried if they were all
-  // enabled.
-  std::vector<RegisteredPluginInfo> GetPluginInfoForAllInstances() {
-    // Lookup the plugin info for each instance in the sorted order.
-    std::vector<RegisteredPluginInfo> plugin_infos;
-    plugin_infos.reserve(m_instances.size());
-    for (const Instance &instance : m_instances)
-      plugin_infos.push_back(
-          {instance.name, instance.description, instance.enabled});
-
-    return plugin_infos;
-  }
-
-  bool SetInstanceEnabled(llvm::StringRef name, bool enable) {
-    auto it = std::find_if(
-        m_instances.begin(), m_instances.end(),
-        [&](const Instance &instance) { return instance.name == name; });
-
-    if (it == m_instances.end())
-      return false;
-
-    it->enabled = enable;
-    return true;
-  }
-
 private:
   std::vector<Instance> m_instances;
 };
@@ -667,15 +627,6 @@ PluginManager::GetSystemRuntimeCreateCallbackAtIndex(uint32_t idx) {
   return GetSystemRuntimeInstances().GetCallbackAtIndex(idx);
 }
 
-std::vector<RegisteredPluginInfo> PluginManager::GetSystemRuntimePluginInfo() {
-  return GetSystemRuntimeInstances().GetPluginInfoForAllInstances();
-}
-
-bool PluginManager::SetSystemRuntimePluginEnabled(llvm::StringRef name,
-                                                  bool enable) {
-  return GetSystemRuntimeInstances().SetInstanceEnabled(name, enable);
-}
-
 #pragma mark ObjectFile
 
 struct ObjectFileInstance : public PluginInstance<ObjectFileCreateInstance> {

lldb/unittests/Core/CMakeLists.txt

@@ -7,7 +7,6 @@ add_lldb_unittest(LLDBCoreTests
   FormatEntityTest.cpp
   MangledTest.cpp
   ModuleSpecTest.cpp
-  PluginManagerTest.cpp
   ProgressReportTest.cpp
   RichManglingContextTest.cpp
   SourceLocationSpecTest.cpp