6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-08-17 05:29:24 +00:00
Code Issues Projects Releases Wiki Activity

Switch ValueSymbolTable to use StringMap<Value*> instead of std::map<std::string, Value*>

Browse Source 
as its main datastructure.  There are many improvements yet to be made, but
this speeds up opt --std-compile-opts on 447.dealII by 7.3%.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@34193 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2007-02-12 05:18:08 +00:00
parent fa48e9612e
commit dec628eead
16 changed files with 174 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/llvm/Constant.h
View File

@ -39,9 +39,8 @@ class Constant : public User {
void operator=(const Constant &); // Do not implement
Constant(const Constant &); // Do not implement
protected:
Constant(const Type *Ty, ValueTy vty, Use *Ops, unsigned NumOps,
const std::string& Name = "")
: User(Ty, vty, Ops, NumOps, Name) {}
Constant(const Type *Ty, ValueTy vty, Use *Ops, unsigned NumOps)
: User(Ty, vty, Ops, NumOps) {}
void destroyConstantImpl();
public:

6
include/llvm/GlobalValue.h
View File

@ -49,8 +49,10 @@ public:
protected:
GlobalValue(const Type *Ty, ValueTy vty, Use *Ops, unsigned NumOps,
LinkageTypes linkage, const std::string &name = "")
: Constant(Ty, vty, Ops, NumOps, name), Parent(0),
Linkage(linkage), Visibility(DefaultVisibility), Alignment(0) { }
: Constant(Ty, vty, Ops, NumOps), Parent(0),
Linkage(linkage), Visibility(DefaultVisibility), Alignment(0) {
if (!name.empty()) setName(name);
}
Module *Parent;
LinkageTypes Linkage; // The linkage of this global

6
include/llvm/User.h
View File

@ -20,7 +20,6 @@
#define LLVM_USER_H
#include "llvm/Value.h"
#include <vector>
namespace llvm {
@ -39,9 +38,8 @@ protected:
unsigned NumOperands;
public:
User(const Type *Ty, unsigned vty, Use *OpList, unsigned NumOps,
const std::string &name = "")
: Value(Ty, vty, name), OperandList(OpList), NumOperands(NumOps) {}
User(const Type *Ty, unsigned vty, Use *OpList, unsigned NumOps)
: Value(Ty, vty), OperandList(OpList), NumOperands(NumOps) {}
Value *getOperand(unsigned i) const {
assert(i < NumOperands && "getOperand() out of range!");

11
include/llvm/Value.h
View File

@ -33,6 +33,8 @@ class GlobalVariable;
class InlineAsm;
class ValueSymbolTable;
class TypeSymbolTable;
template<typename ValueTy> class StringMapEntry;
typedef StringMapEntry<Value*> ValueName;
//===----------------------------------------------------------------------===//
// Value Class
@ -61,13 +63,13 @@ private:
friend class ValueSymbolTable; // Allow ValueSymbolTable to directly mod Name.
friend class SymbolTable; // Allow SymbolTable to directly poke Name.
std::string Name;
ValueName *Name;
void operator=(const Value &); // Do not implement
Value(const Value &); // Do not implement
public:
Value(const Type *Ty, unsigned scid, const std::string &name = "");
Value(const Type *Ty, unsigned scid);
virtual ~Value();
/// dump - Support for debugging, callable in GDB: V->dump()
@ -84,8 +86,9 @@ public:
inline const Type *getType() const { return Ty; }
// All values can potentially be named...
inline bool hasName() const { return !Name.empty(); }
inline const std::string &getName() const { return Name; }
inline bool hasName() const { return Name != 0; }
std::string getName() const;
ValueName *getValueName() const { return Name; }
void setName(const std::string &name);

33
include/llvm/ValueSymbolTable.h
View File

@ -17,7 +17,7 @@
#define LLVM_VALUE_SYMBOL_TABLE_H
#include "llvm/Value.h"
#include <map>
#include "llvm/ADT/StringMap.h"
namespace llvm {
template<typename ValueSubClass, typename ItemParentClass,
@ -47,9 +47,8 @@ class ValueSymbolTable {
/// @name Types
/// @{
public:
/// @brief A mapping of names to values.
typedef std::map<const std::string, Value *> ValueMap;
typedef StringMap<Value*> ValueMap;
/// @brief An iterator over a ValueMap.
typedef ValueMap::iterator iterator;
@ -89,12 +88,6 @@ public:
/// @brief Get a name unique to this symbol table
std::string getUniqueName(const std::string &BaseName) const;
/// @return 1 if the name is in the symbol table, 0 otherwise
/// @brief Determine if a name is in the symbol table
bool count(const std::string &name) const {
return vmap.count(name);
}
/// This function can be used from the debugger to display the
/// content of the symbol table while debugging.
/// @brief Print out symbol table on stderr
@ -104,7 +97,6 @@ public:
/// @name Iteration
/// @{
public:
/// @brief Get an iterator that from the beginning of the symbol table.
inline iterator begin() { return vmap.begin(); }
@ -116,21 +108,26 @@ public:
/// @brief Get a const_iterator to the end of the symbol table.
inline const_iterator end() const { return vmap.end(); }
/// @}
/// @name Mutators
/// @{
private:
/// This method adds the provided value \p N to the symbol table. The Value
/// must have a name which is used to place the value in the symbol table.
/// If the inserted name conflicts, this renames the value.
/// @brief Add a named value to the symbol table
void insert(Value *Val);
/// This method removes a value from the symbol table. The name of the
/// Value is extracted from \p Val and used to lookup the Value in the
/// symbol table. \p Val is not deleted, just removed from the symbol table.
/// @brief Remove a value from the symbol table.
void remove(Value* Val);
void reinsertValue(Value *V);
/// createValueName - This method attempts to create a value name and insert
/// it into the symbol table with the specified name. If it conflicts, it
/// auto-renames the name and returns that instead.
ValueName *createValueName(const char *NameStart, unsigned NameLen, Value *V);
/// This method removes a value from the symbol table. It leaves the
/// ValueName attached to the value, but it is no longer inserted in the
/// symtab.
void removeValueName(ValueName *V);
/// @}
/// @name Internal Data

2
lib/Bytecode/Writer/SlotCalculator.cpp
View File

@ -199,7 +199,7 @@ void SlotCalculator::processTypeSymbolTable(const TypeSymbolTable *TST) {
void SlotCalculator::processValueSymbolTable(const ValueSymbolTable *VST) {
for (ValueSymbolTable::const_iterator VI = VST->begin(), VE = VST->end();
VI != VE; ++VI)
CreateSlotIfNeeded(VI->second);
CreateSlotIfNeeded(VI->getValue());
}
void SlotCalculator::CreateSlotIfNeeded(const Value *V) {

15
lib/Bytecode/Writer/Writer.cpp
View File

@ -132,10 +132,9 @@ inline void BytecodeWriter::output_vbr(int i) {
output_vbr((unsigned)i << 1); // Low order bit is clear.
}
inline void BytecodeWriter::output(const std::string &s) {
unsigned Len = s.length();
inline void BytecodeWriter::output_str(const char *Str, unsigned Len) {
output_vbr(Len); // Strings may have an arbitrary length.
Out.insert(Out.end(), s.begin(), s.end());
Out.insert(Out.end(), Str, Str+Len);
}
inline void BytecodeWriter::output_data(const void *Ptr, const void *End) {
@ -1088,14 +1087,12 @@ void BytecodeWriter::outputValueSymbolTable(const ValueSymbolTable &VST) {
true/*ElideIfEmpty*/);
// Organize the symbol table by type
typedef std::pair<const std::string*, const Value*> PlaneMapEntry;
typedef SmallVector<PlaneMapEntry, 8> PlaneMapVector;
typedef SmallVector<const ValueName*, 8> PlaneMapVector;
typedef DenseMap<const Type*, PlaneMapVector > PlaneMap;
PlaneMap Planes;
for (ValueSymbolTable::const_iterator SI = VST.begin(), SE = VST.end();
SI != SE; ++SI)
Planes[SI->second->getType()]
.push_back(std::make_pair(&SI->first, SI->second));
Planes[SI->getValue()->getType()].push_back(&*SI);
for (PlaneMap::iterator PI = Planes.begin(), PE = Planes.end();
PI != PE; ++PI) {
@ -1113,8 +1110,8 @@ void BytecodeWriter::outputValueSymbolTable(const ValueSymbolTable &VST) {
// Write each of the values in this plane
for (; I != End; ++I) {
// Symtab entry: [def slot #][name]
output_vbr(Table.getSlot(I->second));
output(*I->first);
output_vbr(Table.getSlot((*I)->getValue()));
output_str((*I)->getKeyData(), (*I)->getKeyLength());
}
}
}

5
lib/Bytecode/Writer/WriterInternals.h
View File

@ -85,7 +85,10 @@ private:
/// @brief Signed 32-bit variable bit rate output primitive.
inline void output_vbr(int i);
inline void output(const std::string &s);
inline void output_str(const char *Str, unsigned Len);
inline void output(const std::string &s) {
output_str(&s[0], s.size());
}
inline void output_data(const void *Ptr, const void *End);

2
lib/Transforms/IPO/StripSymbols.cpp
View File

@ -77,7 +77,7 @@ static void RemoveDeadConstant(Constant *C) {
//
static void StripSymtab(ValueSymbolTable &ST) {
for (ValueSymbolTable::iterator VI = ST.begin(), VE = ST.end(); VI != VE; ) {
Value *V = VI->second;
Value *V = VI->getValue();
++VI;
if (!isa<GlobalValue>(V) || cast<GlobalValue>(V)->hasInternalLinkage()) {
// Set name to "", removing from symbol table!

4
lib/VMCore/BasicBlock.cpp
View File

@ -62,7 +62,7 @@ template class SymbolTableListTraits<Instruction, BasicBlock, Function>;
BasicBlock::BasicBlock(const std::string &Name, Function *Parent,
BasicBlock *InsertBefore)
: Value(Type::LabelTy, Value::BasicBlockVal, Name) {
: Value(Type::LabelTy, Value::BasicBlockVal) {
// Initialize the instlist...
InstList.setItemParent(this);
@ -76,6 +76,8 @@ BasicBlock::BasicBlock(const std::string &Name, Function *Parent,
} else if (Parent) {
Parent->getBasicBlockList().push_back(this);
}
setName(Name);
}

3
lib/VMCore/Function.cpp
View File

@ -51,7 +51,7 @@ template class SymbolTableListTraits<BasicBlock, Function, Function>;
//===----------------------------------------------------------------------===//
Argument::Argument(const Type *Ty, const std::string &Name, Function *Par)
: Value(Ty, Value::ArgumentVal, Name) {
: Value(Ty, Value::ArgumentVal) {
Parent = 0;
// Make sure that we get added to a function
@ -59,6 +59,7 @@ Argument::Argument(const Type *Ty, const std::string &Name, Function *Par)
if (Par)
Par->getArgumentList().push_back(this);
setName(Name);
}
void Argument::setParent(Function *parent) {

6
lib/VMCore/Instruction.cpp
View File

@ -19,7 +19,7 @@ using namespace llvm;
Instruction::Instruction(const Type *ty, unsigned it, Use *Ops, unsigned NumOps,
const std::string &Name, Instruction *InsertBefore)
: User(ty, Value::InstructionVal + it, Ops, NumOps, Name), Parent(0) {
: User(ty, Value::InstructionVal + it, Ops, NumOps), Parent(0) {
// Make sure that we get added to a basicblock
LeakDetector::addGarbageObject(this);
@ -29,17 +29,19 @@ Instruction::Instruction(const Type *ty, unsigned it, Use *Ops, unsigned NumOps,
"Instruction to insert before is not in a basic block!");
InsertBefore->getParent()->getInstList().insert(InsertBefore, this);
}
setName(Name);
}
Instruction::Instruction(const Type *ty, unsigned it, Use *Ops, unsigned NumOps,
const std::string &Name, BasicBlock *InsertAtEnd)
: User(ty, Value::InstructionVal + it, Ops, NumOps, Name), Parent(0) {
: User(ty, Value::InstructionVal + it, Ops, NumOps), Parent(0) {
// Make sure that we get added to a basicblock
LeakDetector::addGarbageObject(this);
// append this instruction into the basic block
assert(InsertAtEnd && "Basic block to append to may not be NULL!");
InsertAtEnd->getInstList().push_back(this);
setName(Name);
}
// Out of line virtual method, so the vtable, etc has a home.

12
lib/VMCore/SymbolTableListTraitsImpl.h
View File

@ -32,7 +32,7 @@ void SymbolTableListTraits<ValueSubClass,ItemParentClass,SymTabClass,SubClass>
ValueSymbolTable &SymTab = SymTabObject->getValueSymbolTable();
for (typename iplist<ValueSubClass>::iterator I = List.begin();
I != List.end(); ++I)
if (I->hasName()) SymTab.remove(I);
if (I->hasName()) SymTab.removeValueName(I->getValueName());
}
SymTabObject = STO;
@ -42,7 +42,7 @@ void SymbolTableListTraits<ValueSubClass,ItemParentClass,SymTabClass,SubClass>
ValueSymbolTable &SymTab = SymTabObject->getValueSymbolTable();
for (typename iplist<ValueSubClass>::iterator I = List.begin();
I != List.end(); ++I)
if (I->hasName()) SymTab.insert(I);
if (I->hasName()) SymTab.reinsertValue(I);
}
}
@ -53,7 +53,7 @@ void SymbolTableListTraits<ValueSubClass,ItemParentClass,SymTabClass,SubClass>
assert(V->getParent() == 0 && "Value already in a container!!");
V->setParent(ItemParent);
if (V->hasName() && SymTabObject)
SymTabObject->getValueSymbolTable().insert(V);
SymTabObject->getValueSymbolTable().reinsertValue(V);
}
template<typename ValueSubClass, typename ItemParentClass, typename SymTabClass,
@ -62,7 +62,7 @@ void SymbolTableListTraits<ValueSubClass,ItemParentClass,SymTabClass,SubClass>
::removeNodeFromList(ValueSubClass *V) {
V->setParent(0);
if (V->hasName() && SymTabObject)
SymTabObject->getValueSymbolTable().remove(V);
SymTabObject->getValueSymbolTable().removeValueName(V->getValueName());
}
template<typename ValueSubClass, typename ItemParentClass, typename SymTabClass,
@ -83,10 +83,10 @@ void SymbolTableListTraits<ValueSubClass,ItemParentClass,SymTabClass,SubClass>
ValueSubClass &V = *first;
bool HasName = V.hasName();
if (OldSTO && HasName)
OldSTO->getValueSymbolTable().remove(&V);
OldSTO->getValueSymbolTable().removeValueName(V.getValueName());
V.setParent(NewIP);
if (NewSTO && HasName)
NewSTO->getValueSymbolTable().insert(&V);
NewSTO->getValueSymbolTable().reinsertValue(&V);
}
} else {
// Just transferring between blocks in the same function, simply update the

69
lib/VMCore/Value.cpp
View File

@ -30,15 +30,13 @@ static inline const Type *checkType(const Type *Ty) {
return Ty;
}
Value::Value(const Type *ty, unsigned scid, const std::string &name)
Value::Value(const Type *ty, unsigned scid)
: SubclassID(scid), SubclassData(0), Ty(checkType(ty)),
UseList(0), Name(name) {
UseList(0), Name(0) {
if (!isa<Constant>(this) && !isa<BasicBlock>(this))
assert((Ty->isFirstClassType() || Ty == Type::VoidTy ||
isa<OpaqueType>(ty)) &&
"Cannot create non-first-class values except for constants!");
if (ty == Type::VoidTy)
assert(name.empty() && "Cannot have named void values!");
}
Value::~Value() {
@ -114,29 +112,62 @@ static bool getSymTab(Value *V, ValueSymbolTable *&ST) {
return false;
}
void Value::setName(const std::string &name) {
if (Name == name) return; // Name is already set.
std::string Value::getName() const {
if (Name == 0) return "";
return std::string(Name->getKeyData(),
Name->getKeyData()+Name->getKeyLength());
}
void Value::setName(const std::string &name) {
if (name.empty() && !hasName()) return;
if (getType() != Type::VoidTy && "Cannot assign a name to void values!");
// Get the symbol table to update for this object.
ValueSymbolTable *ST;
if (getSymTab(this, ST))
return; // Cannot set a name on this value (e.g. constant).
if (!ST) // No symbol table to update? Just do the change.
Name = name;
else if (hasName()) {
if (!name.empty()) { // Replacing name.
ST->remove(this);
Name = name;
ST->insert(this);
} else { // Transitioning from hasName -> noname.
ST->remove(this);
Name.clear();
if (!ST) { // No symbol table to update? Just do the change.
if (name.empty()) {
// Free the name for this value.
Name->Destroy();
Name = 0;
} else {
if (Name) {
// Name isn't changing.
if (name.size() == Name->getKeyLength() &&
!memcmp(Name->getKeyData(), &name[0], name.size()))
return;
Name->Destroy();
}
// Create the new name.
Name = ValueName::Create(&name[0], &name[name.size()]);
Name->setValue(this);
}
} else { // Transitioning from noname -> hasName.
Name = name;
ST->insert(this);
return;
}
// NOTE: Could optimize for the case the name is shrinking to not deallocate
// then reallocated.
if (hasName()) {
// Name isn't changing?
if (name.size() == Name->getKeyLength() &&
!memcmp(Name->getKeyData(), &name[0], name.size()))
return;
// Remove old name.
ST->removeValueName(Name);
Name->Destroy();
Name = 0;
if (name.empty())
return;
}
// Name is changing to something new.
Name = ST->createValueName(&name[0], name.size(), this);
}
/// takeName - transfer the name from V to this value, setting V's name to

102
lib/VMCore/ValueSymbolTable.cpp
View File

@ -17,7 +17,6 @@
#include "llvm/ValueSymbolTable.h"
#include "llvm/ADT/StringExtras.h"
#include "llvm/Support/Debug.h"
#include <algorithm>
using namespace llvm;
// Class destructor
@ -25,8 +24,8 @@ ValueSymbolTable::~ValueSymbolTable() {
#ifndef NDEBUG // Only do this in -g mode...
for (iterator VI = vmap.begin(), VE = vmap.end(); VI != VE; ++VI)
DEBUG(DOUT << "Value still in symbol table! Type = '"
<< VI->second->getType()->getDescription() << "' Name = '"
<< VI->first << "'\n");
<< VI->getValue()->getType()->getDescription() << "' Name = '"
<< VI->getKeyData() << "'\n");
assert(vmap.empty() && "Values remain in symbol table!");
#endif
}
@ -37,11 +36,11 @@ ValueSymbolTable::~ValueSymbolTable() {
//
std::string ValueSymbolTable::getUniqueName(const std::string &BaseName) const {
std::string TryName = BaseName;
const_iterator End = vmap.end();
// See if the name exists
while (vmap.find(TryName) != End) // Loop until we find a free
TryName = BaseName + utostr(++LastUnique); // name in the symbol table
while (vmap.find(&TryName[0], &TryName[TryName.size()]) != vmap.end())
// Loop until we find a free name in the symbol table.
TryName = BaseName + utostr(++LastUnique);
return TryName;
}
@ -49,62 +48,95 @@ std::string ValueSymbolTable::getUniqueName(const std::string &BaseName) const {
// lookup a value - Returns null on failure...
//
Value *ValueSymbolTable::lookup(const std::string &Name) const {
const_iterator VI = vmap.find(Name);
const_iterator VI = vmap.find(&Name[0], &Name[Name.size()]);
if (VI != vmap.end()) // We found the symbol
return const_cast<Value*>(VI->second);
return VI->getValue();
return 0;
}
// Insert a value into the symbol table with the specified name...
//
void ValueSymbolTable::insert(Value* V) {
assert(V && "Can't insert null Value into symbol table!");
void ValueSymbolTable::reinsertValue(Value* V) {
assert(V->hasName() && "Can't insert nameless Value into symbol table");
// Try inserting the name, assuming it won't conflict.
if (vmap.insert(make_pair(V->Name, V)).second) {
if (vmap.insert(V->Name)) {
DOUT << " Inserted value: " << V->Name << ": " << *V << "\n";
return;
}
// FIXME: this could be much more efficient.
// Otherwise, there is a naming conflict. Rename this value.
std::string UniqueName = V->getName();
V->Name->Destroy();
unsigned BaseSize = UniqueName.size();
do {
while (1) {
// Trim any suffix off.
UniqueName.resize(BaseSize);
UniqueName += utostr(++LastUnique);
// Try insert the vmap entry with this suffix.
} while (!vmap.insert(make_pair(UniqueName, V)).second);
ValueName &NewName = vmap.GetOrCreateValue(&UniqueName[0],
&UniqueName[UniqueName.size()]);
if (NewName.getValue() == 0) {
// Newly inserted name. Success!
NewName.setValue(V);
V->Name = &NewName;
DEBUG(DOUT << " Inserted value: " << UniqueName << ": " << *V << "\n");
return;
}
}
}
V->Name = UniqueName;
void ValueSymbolTable::removeValueName(ValueName *V) {
DEBUG(DOUT << " Removing Value: " << V->getKeyData() << "\n");
// Remove the value from the plane.
vmap.remove(V);
}
/// createValueName - This method attempts to create a value name and insert
/// it into the symbol table with the specified name. If it conflicts, it
/// auto-renames the name and returns that instead.
ValueName *ValueSymbolTable::createValueName(const char *NameStart,
unsigned NameLen, Value *V) {
ValueName &Entry = vmap.GetOrCreateValue(NameStart, NameStart+NameLen);
if (Entry.getValue() == 0) {
Entry.setValue(V);
DEBUG(DOUT << " Inserted value: " << Entry.getKeyData() << ": "
<< *V << "\n");
return &Entry;
}
DEBUG(DOUT << " Inserted value: " << UniqueName << ": " << *V << "\n");
// FIXME: this could be much more efficient.
// Otherwise, there is a naming conflict. Rename this value.
std::string UniqueName(NameStart, NameStart+NameLen);
while (1) {
// Trim any suffix off.
UniqueName.resize(NameLen);
UniqueName += utostr(++LastUnique);
// Try insert the vmap entry with this suffix.
ValueName &NewName = vmap.GetOrCreateValue(&UniqueName[0],
&UniqueName[UniqueName.size()]);
if (NewName.getValue() == 0) {
// Newly inserted name. Success!
NewName.setValue(V);
DEBUG(DOUT << " Inserted value: " << UniqueName << ": " << *V << "\n");
return &NewName;
}
}
}
// Remove a value
void ValueSymbolTable::remove(Value *V) {
assert(V->hasName() && "Value doesn't have name!");
iterator Entry = vmap.find(V->getName());
assert(Entry != vmap.end() && "Entry was not in the symtab!");
DEBUG(DOUT << " Removing Value: " << Entry->second->getName() << "\n");
// Remove the value from the plane...
vmap.erase(Entry);
}
// DumpVal - a std::for_each function for dumping a value
//
static void DumpVal(const std::pair<const std::string, Value *> &V) {
DOUT << " '" << V.first << "' = ";
V.second->dump();
DOUT << "\n";
}
// dump - print out the symbol table
//
void ValueSymbolTable::dump() const {
DOUT << "ValueSymbolTable:\n";
for_each(vmap.begin(), vmap.end(), DumpVal);
for (const_iterator I = begin(), E = end(); I != E; ++I) {
DOUT << " '" << I->getKeyData() << "' = ";
I->getValue()->dump();
DOUT << "\n";
}
}

21
lib/VMCore/Verifier.cpp
View File

@ -51,7 +51,6 @@
#include "llvm/Instructions.h"
#include "llvm/Intrinsics.h"
#include "llvm/PassManager.h"
#include "llvm/ValueSymbolTable.h"
#include "llvm/Analysis/Dominators.h"
#include "llvm/Support/CFG.h"
#include "llvm/Support/InstVisitor.h"
@ -102,7 +101,6 @@ namespace { // Anonymous namespace for class
bool doInitialization(Module &M) {
Mod = &M;
verifyTypeSymbolTable(M.getTypeSymbolTable());
verifyValueSymbolTable(M.getValueSymbolTable());
// If this is a real pass, in a pass manager, we must abort before
// returning back to the pass manager, or else the pass manager may try to
@ -177,7 +175,6 @@ namespace { // Anonymous namespace for class
// Verification methods...
void verifyTypeSymbolTable(TypeSymbolTable &ST);
void verifyValueSymbolTable(ValueSymbolTable &ST);
void visitGlobalValue(GlobalValue &GV);
void visitGlobalVariable(GlobalVariable &GV);
void visitFunction(Function &F);
@ -307,22 +304,6 @@ void Verifier::visitGlobalVariable(GlobalVariable &GV) {
void Verifier::verifyTypeSymbolTable(TypeSymbolTable &ST) {
}
// verifySymbolTable - Verify that a function or module symbol table is ok
//
void Verifier::verifyValueSymbolTable(ValueSymbolTable &ST) {
// Loop over all of the values in the symbol table.
for (ValueSymbolTable::const_iterator VI = ST.begin(), VE = ST.end();
VI != VE; ++VI) {
Value *V = VI->second;
// Check that there are no void typed values in the symbol table. Values
// with a void type cannot be put into symbol tables because they cannot
// have names!
Assert1(V->getType() != Type::VoidTy,
"Values with void type are not allowed to have names!", V);
}
}
// visitFunction - Verify that a function is ok.
//
void Verifier::visitFunction(Function &F) {
@ -375,8 +356,6 @@ void Verifier::visitFunction(Function &F) {
Assert1(F.getName().substr(0, 5) != "llvm.",
"llvm intrinsics cannot be defined!", &F);
verifyValueSymbolTable(F.getValueSymbolTable());
// Check the entry node
BasicBlock *Entry = &F.getEntryBlock();
Assert1(pred_begin(Entry) == pred_end(Entry),