6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-13 20:32:21 +00:00
Code Issues Projects Releases Wiki Activity

Rename lib/VMCore/ConstantsContext.h:ValueMap<> to ConstantUniqueMap<> to avoid

Browse Source 
colliding with llvm/ADT/ValueMap.h:ValueMap<>.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@85344 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jeffrey Yasskin 2009-10-27 23:45:55 +00:00
parent c872e9c07d
commit 03236140fa
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/VMCore/ConstantsContext.h
View File

@ -332,7 +332,7 @@ struct ExprMapKeyType {
// The number of operands for each ConstantCreator::create method is
// determined by the ConstantTraits template.
// ConstantCreator - A class that is used to create constants by
// ValueMap*. This class should be partially specialized if there is
// ConstantUniqueMap*. This class should be partially specialized if there is
// something strange that needs to be done to interface to the ctor for the
// constant.
//
@ -506,7 +506,7 @@ struct ConstantKeyData<UndefValue> {
template<class ValType, class TypeClass, class ConstantClass,
bool HasLargeKey = false /*true for arrays and structs*/ >
class ValueMap : public AbstractTypeUser {
class ConstantUniqueMap : public AbstractTypeUser {
public:
typedef std::pair<const TypeClass*, ValType> MapKey;
typedef std::map<MapKey, ConstantClass *> MapTy;
@ -529,8 +529,8 @@ private:
///
AbstractTypeMapTy AbstractTypeMap;
/// ValueMapLock - Mutex for this map.
sys::SmartMutex<true> ValueMapLock;
/// ConstantUniqueMapLock - Mutex for this map.
sys::SmartMutex<true> ConstantUniqueMapLock;
public:
// NOTE: This function is not locked. It is the caller's responsibility
@ -619,7 +619,7 @@ public:
/// getOrCreate - Return the specified constant from the map, creating it if
/// necessary.
ConstantClass *getOrCreate(const TypeClass *Ty, const ValType &V) {
sys::SmartScopedLock<true> Lock(ValueMapLock);
sys::SmartScopedLock<true> Lock(ConstantUniqueMapLock);
MapKey Lookup(Ty, V);
ConstantClass* Result = 0;
@ -674,7 +674,7 @@ public:
}
void remove(ConstantClass *CP) {
sys::SmartScopedLock<true> Lock(ValueMapLock);
sys::SmartScopedLock<true> Lock(ConstantUniqueMapLock);
typename MapTy::iterator I = FindExistingElement(CP);
assert(I != Map.end() && "Constant not found in constant table!");
assert(I->second == CP && "Didn't find correct element?");
@ -725,7 +725,7 @@ public:
}
void refineAbstractType(const DerivedType *OldTy, const Type *NewTy) {
sys::SmartScopedLock<true> Lock(ValueMapLock);
sys::SmartScopedLock<true> Lock(ConstantUniqueMapLock);
typename AbstractTypeMapTy::iterator I = AbstractTypeMap.find(OldTy);
assert(I != AbstractTypeMap.end() &&
@ -778,7 +778,7 @@ public:
}
void dump() const {
DEBUG(errs() << "Constant.cpp: ValueMap\n");
DEBUG(errs() << "Constant.cpp: ConstantUniqueMap\n");
}
};

18
lib/VMCore/LLVMContextImpl.h
View File

@ -108,25 +108,25 @@ public:
FoldingSet<MDNode> MDNodeSet;
ValueMap<char, Type, ConstantAggregateZero> AggZeroConstants;
ConstantUniqueMap<char, Type, ConstantAggregateZero> AggZeroConstants;
typedef ValueMap<std::vector<Constant*>, ArrayType,
typedef ConstantUniqueMap<std::vector<Constant*>, ArrayType,
ConstantArray, true /*largekey*/> ArrayConstantsTy;
ArrayConstantsTy ArrayConstants;
typedef ValueMap<std::vector<Constant*>, StructType,
ConstantStruct, true /*largekey*/> StructConstantsTy;
typedef ConstantUniqueMap<std::vector<Constant*>, StructType,
ConstantStruct, true /*largekey*/> StructConstantsTy;
StructConstantsTy StructConstants;
typedef ValueMap<std::vector<Constant*>, VectorType,
ConstantVector> VectorConstantsTy;
typedef ConstantUniqueMap<std::vector<Constant*>, VectorType,
ConstantVector> VectorConstantsTy;
VectorConstantsTy VectorConstants;
ValueMap<char, PointerType, ConstantPointerNull> NullPtrConstants;
ConstantUniqueMap<char, PointerType, ConstantPointerNull> NullPtrConstants;
ValueMap<char, Type, UndefValue> UndefValueConstants;
ConstantUniqueMap<char, Type, UndefValue> UndefValueConstants;
ValueMap<ExprMapKeyType, Type, ConstantExpr> ExprConstants;
ConstantUniqueMap<ExprMapKeyType, Type, ConstantExpr> ExprConstants;
ConstantInt *TheTrueVal;
ConstantInt *TheFalseVal;