Oops, should be part of 41664; won't work very well without this piece.

[oota-llvm.git] / lib / Support / PluginLoader.cpp

diff --git a/lib/Support/PluginLoader.cpp b/lib/Support/PluginLoader.cpp
index 77eb52852dee6d0a46c5770f9544d12313e5a8c8..3c9de89a4265d2b8ea513b768496a16c20471c7f 100644 (file)
--- a/lib/Support/PluginLoader.cpp
+++ b/lib/Support/PluginLoader.cpp
@@ -13,38 +13,32 @@
 
 #define DONT_GET_PLUGIN_LOADER_OPTION
 #include "llvm/Support/PluginLoader.h"
+#include "llvm/Support/Streams.h"
 #include "llvm/System/DynamicLibrary.h"
-#include <iostream>
+#include <ostream>
 #include <vector>
-
 using namespace llvm;
 
-std::vector<std::string> plugins;
+static std::vector<std::string> *Plugins;
 
 void PluginLoader::operator=(const std::string &Filename) {
-  std::string ErrorMessage;
-  try {
-    sys::DynamicLibrary::LoadLibraryPermanently(Filename.c_str());
-    plugins.push_back(Filename);
-  } catch (const std::string& errmsg) {
-    if (errmsg.empty()) {
-      ErrorMessage = "Unknown";
-    } else {
-      ErrorMessage = errmsg;
-    }
+  if (!Plugins)
+    Plugins = new std::vector<std::string>();
+
+  std::string Error;
+  if (sys::DynamicLibrary::LoadLibraryPermanently(Filename.c_str(), &Error)) {
+    cerr << "Error opening '" << Filename << "': " << Error
+         << "\n  -load request ignored.\n";
+  } else {
+    Plugins->push_back(Filename);
   }
-  if (!ErrorMessage.empty())
-    std::cerr << "Error opening '" << Filename << "': " << ErrorMessage
-              << "\n  -load request ignored.\n";
 }
 
-unsigned PluginLoader::getNumPlugins()
-{
-  return plugins.size();
+unsigned PluginLoader::getNumPlugins() {
+  return Plugins ? Plugins->size() : 0;
 }
 
-std::string& PluginLoader::getPlugin(unsigned num)
-{
-  assert(num < plugins.size() && "Asking for an out of bounds plugin");
-  return plugins[num];
+std::string &PluginLoader::getPlugin(unsigned num) {
+  assert(Plugins && num < Plugins->size() && "Asking for an out of bounds plugin");
+  return (*Plugins)[num];
 }