Privatize the FunctionType table.

llvm-svn: 78221
This commit is contained in:
Owen Anderson 2009-08-05 18:13:27 +00:00
parent 13937d8236
commit 4b5c761af2
2 changed files with 9 additions and 7 deletions

View File

@ -131,6 +131,7 @@ struct LLVMContextImpl {
TypeMap<ArrayValType, ArrayType> ArrayTypes;
TypeMap<VectorValType, VectorType> VectorTypes;
TypeMap<PointerValType, PointerType> PointerTypes;
TypeMap<FunctionValType, FunctionType> FunctionTypes;
LLVMContextImpl() : TheTrueVal(0), TheFalseVal(0) { }
};

View File

@ -748,9 +748,6 @@ APInt IntegerType::getMask() const {
return APInt::getAllOnesValue(getBitWidth());
}
// Define the actual map itself now...
static ManagedStatic<TypeMap<FunctionValType, FunctionType> > FunctionTypes;
FunctionValType FunctionValType::get(const FunctionType *FT) {
// Build up a FunctionValType
std::vector<const Type *> ParamTypes;
@ -768,14 +765,16 @@ FunctionType *FunctionType::get(const Type *ReturnType,
FunctionValType VT(ReturnType, Params, isVarArg);
FunctionType *FT = 0;
LLVMContextImpl *pImpl = ReturnType->getContext().pImpl;
sys::SmartScopedLock<true> L(*TypeMapLock);
FT = FunctionTypes->get(VT);
FT = pImpl->FunctionTypes.get(VT);
if (!FT) {
FT = (FunctionType*) operator new(sizeof(FunctionType) +
sizeof(PATypeHandle)*(Params.size()+1));
new (FT) FunctionType(ReturnType, Params, isVarArg);
FunctionTypes->add(VT, FT);
pImpl->FunctionTypes.add(VT, FT);
}
#ifdef DEBUG_MERGE_TYPES
@ -1101,11 +1100,13 @@ void DerivedType::notifyUsesThatTypeBecameConcrete() {
//
void FunctionType::refineAbstractType(const DerivedType *OldType,
const Type *NewType) {
FunctionTypes->RefineAbstractType(this, OldType, NewType);
LLVMContextImpl *pImpl = OldType->getContext().pImpl;
pImpl->FunctionTypes.RefineAbstractType(this, OldType, NewType);
}
void FunctionType::typeBecameConcrete(const DerivedType *AbsTy) {
FunctionTypes->TypeBecameConcrete(this, AbsTy);
LLVMContextImpl *pImpl = AbsTy->getContext().pImpl;
pImpl->FunctionTypes.TypeBecameConcrete(this, AbsTy);
}