[NFC] cleanup plugins.cpp a little

driver/plugins.cpp

@@ -9,6 +9,9 @@
 //
 // Implements functionality related to plugins (`-plugin=...`).
 //
+// Note: plugins can be LLVM-plugins (to be registered with the pass manager),
+// or dlang-plugins for semantic analysis.
+//
 //===----------------------------------------------------------------------===//
 
 #include "driver/plugins.h"
@@ -38,10 +41,24 @@ cl::list<std::string> pluginFiles("plugin", cl::CommaSeparated,
 
 } // anonymous namespace
 
+/// Loads all plugins for the legacy pass manaager. The static constructor of
+/// each plugin should take care of the plugins registering themself with the
+/// rest of LDC/LLVM.
+void loadAllPluginsLegacyPM() {
+  for (auto &filename : pluginFiles) {
+    std::string errorString;
+    if (llvm::sys::DynamicLibrary::LoadLibraryPermanently(filename.c_str(),
+                                                          &errorString)) {
+      error(Loc(), "Error loading plugin '%s': %s", filename.c_str(),
+            errorString.c_str());
+    }
+  }
+}
+
 #if LDC_LLVM_VER >= 1400
 
 namespace {
-llvm::SmallVector<llvm::PassPlugin, 1> plugins;
+llvm::SmallVector<llvm::PassPlugin, 1> llvm_plugins;
 }
 /// Loads all plugins for the new pass manager. These plugins will need to be
 /// added When building the optimization pipeline.
@@ -53,42 +70,28 @@ void loadAllPluginsNewPM() {
             llvm::toString(plugin.takeError()).c_str());
       continue;
     }
-    plugins.emplace_back(plugin.get());
+    llvm_plugins.emplace_back(plugin.get());
   }
 }
 void registerAllPluginsWithPassBuilder(llvm::PassBuilder &PB) {
-  for (auto &plugin : plugins) {
+  for (auto &plugin : llvm_plugins) {
     plugin.registerPassBuilderCallbacks(PB);
   }
 }
 
-#endif // LDC_LLVM_VER >= 1400
-
-/// Loads all plugins for the legacy pass manaager. The static constructor of
-/// each plugin should take care of the plugins registering themself with the
-/// rest of LDC/LLVM.
-void loadAllPluginsLegacyPM() {
-  for (auto &filename : pluginFiles) {
-    std::string errorString;
-    if (llvm::sys::DynamicLibrary::LoadLibraryPermanently(filename.c_str(),
-                                                          &errorString)) {
-      error(Loc(), "Error loading plugin '%s': %s", filename.c_str(),
-            errorString.c_str());
-    }
-  }
-}
-
-#if LDC_LLVM_VER >= 1400
 void loadAllPlugins() {
   if (opts::isUsingLegacyPassManager())
     loadAllPluginsLegacyPM();
   else
     loadAllPluginsNewPM();
 }
-#else
+
+#else // LDC_LLVM_VER >= 1400
+
 void loadAllPlugins() { loadAllPluginsLegacyPM(); }
 void registerAllPluginsWithPassBuilder(llvm::PassBuilder &) {}
-#endif
+
+#endif // LDC_LLVM_VER >= 1400
 
 #else // #if LDC_ENABLE_PLUGINS