maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

simplify getOrCreateTypeSlot, eliminat doInsertType. Eliminate post-order iteration stuff. 

llvm-svn: 34127
This commit is contained in:
Chris Lattner 2007-02-10 05:02:50 +00:00
parent d090c6beed
commit 1e91abbf61
2 changed files with 10 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
llvm/lib/Bytecode/Writer/SlotCalculator.cpp
View File

@ -24,7 +24,6 @@
#include "llvm/TypeSymbolTable.h"
#include "llvm/Type.h"
#include "llvm/ValueSymbolTable.h"
#include "llvm/ADT/PostOrderIterator.h"
#include "llvm/ADT/STLExtras.h"
#include <algorithm>
#include <functional>
@ -355,34 +354,16 @@ unsigned SlotCalculator::getOrCreateTypeSlot(const Type *Ty) {
int SlotNo = getTypeSlot(Ty); // Check to see if it's already in!
if (SlotNo != -1) return (unsigned)SlotNo;
// Insert the current type before any subtypes. This is important because
// recursive types elements are inserted in a bottom up order. Changing
// this here can break things. For example:
//
// global { \2 * } { { \2 }* null }
//
unsigned ResultSlot = doInsertType(Ty);
// Insert into TypeMap.
unsigned ResultSlot = TypeMap[Ty] = Types.size();
Types.push_back(Ty);
SC_DEBUG(" Inserting type [" << ResultSlot << "] = " << *Ty << "\n" );
// Loop over any contained types in the definition, ensuring they are also
// inserted.
for (Type::subtype_iterator I = Ty->subtype_begin(), E = Ty->subtype_end();
I != E; ++I)
getOrCreateTypeSlot(*I);
// Loop over any contained types in the definition... in post
// order.
for (po_iterator<const Type*> I = po_begin(Ty), E = po_end(Ty);
I != E; ++I) {
if (*I != Ty && !TypeMap.count(*I)) {
// If we haven't seen this sub type before, add it to our type table!
doInsertType(*I);
}
}
return ResultSlot;
}
// doInsertType - This is a small helper function to be called only
// be insertType.
//
unsigned SlotCalculator::doInsertType(const Type *Ty) {
// Insert into TypeMap.
unsigned DestSlot = TypeMap[Ty] = Types.size();
Types.push_back(Ty);
SC_DEBUG(" Inserting type [" << DestSlot << "] = " << *Ty << "\n" );
return DestSlot;
}

3
llvm/lib/Bytecode/Writer/SlotCalculator.h
View File

@ -107,9 +107,6 @@ private:
void CreateSlotIfNeeded(const Value *V);
unsigned getOrCreateTypeSlot(const Type *T);
// doInsertValue - Small helper function to be called only be insertVal.
unsigned doInsertType(const Type *T);
// processModule - Process all of the module level function declarations and
// types that are available.
//