switch ValueMap to using AssertingVH. This is an old patch I had laying

around in a tree I forgot about.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@78048 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2009-08-04 04:31:02 +00:00
parent 4b3d57228c
commit 0a0193edf9
4 changed files with 12 additions and 11 deletions

View File

@ -38,7 +38,7 @@ class TypeSymbolTable;
template<typename ValueTy> class StringMapEntry;
template <typename ValueTy = Value>
class AssertingVH;
typedef StringMapEntry<Value*> ValueName;
typedef StringMapEntry<AssertingVH<> > ValueName;
class raw_ostream;
class AssemblyAnnotationWriter;
class ValueHandleBase;

View File

@ -17,6 +17,7 @@
#include "llvm/Value.h"
#include "llvm/ADT/StringMap.h"
#include "llvm/Support/DataTypes.h"
#include "llvm/Support/ValueHandle.h"
namespace llvm {
template<typename ValueSubClass, typename ItemParentClass>
@ -44,7 +45,7 @@ class ValueSymbolTable {
/// @{
public:
/// @brief A mapping of names to values.
typedef StringMap<Value*> ValueMap;
typedef StringMap<AssertingVH<> > ValueMap;
/// @brief An iterator over a ValueMap.
typedef ValueMap::iterator iterator;

View File

@ -1083,7 +1083,7 @@ static void WriteValueSymbolTable(const ValueSymbolTable &VST,
// VST_ENTRY: [valueid, namechar x N]
// VST_BBENTRY: [bbid, namechar x N]
unsigned Code;
if (isa<BasicBlock>(SI->getValue())) {
if (isa<BasicBlock>(*SI->getValue())) {
Code = bitc::VST_CODE_BBENTRY;
if (isChar6)
AbbrevToUse = VST_BBENTRY_6_ABBREV;

View File

@ -57,6 +57,14 @@ Value::Value(const Type *ty, unsigned scid)
}
Value::~Value() {
// If this value is named, destroy the name. This should not be in a symtab
// at this point.
if (Name)
Name->Destroy();
// There should be no uses of this object anymore, remove it.
LeakDetector::removeGarbageObject(this);
// Notify all ValueHandles (if present) that this value is going away.
if (HasValueHandle)
ValueHandleBase::ValueIsDeleted(this);
@ -76,14 +84,6 @@ Value::~Value() {
}
#endif
assert(use_empty() && "Uses remain when a value is destroyed!");
// If this value is named, destroy the name. This should not be in a symtab
// at this point.
if (Name)
Name->Destroy();
// There should be no uses of this object anymore, remove it.
LeakDetector::removeGarbageObject(this);
}
/// hasNUses - Return true if this Value has exactly N users.