mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-12-14 11:32:34 +00:00
Fix memcheck-found leaks: one false positive from using new[], and one true
positive where pointers would be leaked on llvm_shutdown. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@97759 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
b58a59b3c1
commit
e8cfa63e4e
@ -18,19 +18,38 @@
|
|||||||
#include "llvm/Support/ErrorHandling.h"
|
#include "llvm/Support/ErrorHandling.h"
|
||||||
#include "llvm/Support/ManagedStatic.h"
|
#include "llvm/Support/ManagedStatic.h"
|
||||||
#include "llvm/Support/raw_ostream.h"
|
#include "llvm/Support/raw_ostream.h"
|
||||||
|
#include "llvm/System/Mutex.h"
|
||||||
#include <map>
|
#include <map>
|
||||||
using namespace llvm;
|
using namespace llvm;
|
||||||
|
|
||||||
static ManagedStatic<PseudoSourceValue[4]> PSVs;
|
namespace {
|
||||||
|
struct PSVGlobalsTy {
|
||||||
|
// PseudoSourceValues are immutable so don't need locking.
|
||||||
|
const PseudoSourceValue PSVs[4];
|
||||||
|
sys::Mutex Lock; // Guards FSValues, but not the values inside it.
|
||||||
|
std::map<int, const PseudoSourceValue *> FSValues;
|
||||||
|
|
||||||
|
PSVGlobalsTy() : PSVs() {}
|
||||||
|
~PSVGlobalsTy() {
|
||||||
|
for (std::map<int, const PseudoSourceValue *>::iterator
|
||||||
|
I = FSValues.begin(), E = FSValues.end(); I != E; ++I) {
|
||||||
|
delete I->second;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
static ManagedStatic<PSVGlobalsTy> PSVGlobals;
|
||||||
|
|
||||||
|
} // anonymous namespace
|
||||||
|
|
||||||
const PseudoSourceValue *PseudoSourceValue::getStack()
|
const PseudoSourceValue *PseudoSourceValue::getStack()
|
||||||
{ return &(*PSVs)[0]; }
|
{ return &PSVGlobals->PSVs[0]; }
|
||||||
const PseudoSourceValue *PseudoSourceValue::getGOT()
|
const PseudoSourceValue *PseudoSourceValue::getGOT()
|
||||||
{ return &(*PSVs)[1]; }
|
{ return &PSVGlobals->PSVs[1]; }
|
||||||
const PseudoSourceValue *PseudoSourceValue::getJumpTable()
|
const PseudoSourceValue *PseudoSourceValue::getJumpTable()
|
||||||
{ return &(*PSVs)[2]; }
|
{ return &PSVGlobals->PSVs[2]; }
|
||||||
const PseudoSourceValue *PseudoSourceValue::getConstantPool()
|
const PseudoSourceValue *PseudoSourceValue::getConstantPool()
|
||||||
{ return &(*PSVs)[3]; }
|
{ return &PSVGlobals->PSVs[3]; }
|
||||||
|
|
||||||
static const char *const PSVNames[] = {
|
static const char *const PSVNames[] = {
|
||||||
"Stack",
|
"Stack",
|
||||||
@ -48,13 +67,13 @@ PseudoSourceValue::PseudoSourceValue(enum ValueTy Subclass) :
|
|||||||
Subclass) {}
|
Subclass) {}
|
||||||
|
|
||||||
void PseudoSourceValue::printCustom(raw_ostream &O) const {
|
void PseudoSourceValue::printCustom(raw_ostream &O) const {
|
||||||
O << PSVNames[this - *PSVs];
|
O << PSVNames[this - PSVGlobals->PSVs];
|
||||||
}
|
}
|
||||||
|
|
||||||
static ManagedStatic<std::map<int, const PseudoSourceValue *> > FSValues;
|
|
||||||
|
|
||||||
const PseudoSourceValue *PseudoSourceValue::getFixedStack(int FI) {
|
const PseudoSourceValue *PseudoSourceValue::getFixedStack(int FI) {
|
||||||
const PseudoSourceValue *&V = (*FSValues)[FI];
|
PSVGlobalsTy &PG = *PSVGlobals;
|
||||||
|
sys::ScopedLock locked(PG.Lock);
|
||||||
|
const PseudoSourceValue *&V = PG.FSValues[FI];
|
||||||
if (!V)
|
if (!V)
|
||||||
V = new FixedStackPseudoSourceValue(FI);
|
V = new FixedStackPseudoSourceValue(FI);
|
||||||
return V;
|
return V;
|
||||||
|
Loading…
Reference in New Issue
Block a user