RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-12-21 02:59:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for PR2881: fix a small leak exposed by valgrind, using a ManagedStatic.

Browse Source 
llvm-svn: 57984
This commit is contained in:
Julien Lerouge 2008-10-22 16:30:41 +00:00
parent 16e190fb8b
commit 89f4df3eae
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Support/PluginLoader.cpp
View File

@ -12,6 +12,7 @@
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#define DONT_GET_PLUGIN_LOADER_OPTION #define DONT_GET_PLUGIN_LOADER_OPTION
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/PluginLoader.h" #include "llvm/Support/PluginLoader.h"
#include "llvm/Support/Streams.h" #include "llvm/Support/Streams.h"
#include "llvm/System/DynamicLibrary.h" #include "llvm/System/DynamicLibrary.h"
@ -19,12 +20,9 @@
#include <vector> #include <vector>
using namespace llvm; using namespace llvm;
static std::vector<std::string> *Plugins; static ManagedStatic<std::vector<std::string> > Plugins;
void PluginLoader::operator=(const std::string &Filename) { void PluginLoader::operator=(const std::string &Filename) {
if (!Plugins)
Plugins = new std::vector<std::string>();
std::string Error; std::string Error;
if (sys::DynamicLibrary::LoadLibraryPermanently(Filename.c_str(), &Error)) { if (sys::DynamicLibrary::LoadLibraryPermanently(Filename.c_str(), &Error)) {
cerr << "Error opening '" << Filename << "': " << Error cerr << "Error opening '" << Filename << "': " << Error
@ -35,10 +33,11 @@ void PluginLoader::operator=(const std::string &Filename) {
} }
unsigned PluginLoader::getNumPlugins() { unsigned PluginLoader::getNumPlugins() {
return Plugins ? Plugins->size() : 0; return Plugins.isConstructed() ? Plugins->size() : 0;
} }
std::string &PluginLoader::getPlugin(unsigned num) { std::string &PluginLoader::getPlugin(unsigned num) {
assert(Plugins && num < Plugins->size() && "Asking for an out of bounds plugin"); assert(Plugins.isConstructed() && num < Plugins->size() &&
"Asking for an out of bounds plugin");
return (*Plugins)[num]; return (*Plugins)[num];
} }