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

Renamed serialization method "Materialize" to "Create". This is an API change. 

llvm-svn: 44034
This commit is contained in:
Ted Kremenek 2007-11-13 00:25:08 +00:00
parent cd51750512
commit e7033b0356
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
llvm/include/llvm/Bitcode/Deserialize.h
View File

@ -152,8 +152,8 @@ public:
} }
template <typename T> template <typename T>
inline T* Materialize() { inline T* Create() {
return SerializeTrait<T>::Materialize(*this); return SerializeTrait<T>::Create(*this);
} }
char* ReadCStr(char* cstr = NULL, unsigned MaxLen=0, bool isNullTerm=true); char* ReadCStr(char* cstr = NULL, unsigned MaxLen=0, bool isNullTerm=true);
@ -166,7 +166,7 @@ public:
if (!PtrID) if (!PtrID)
return NULL; return NULL;
T* x = SerializeTrait<T>::Materialize(*this); T* x = SerializeTrait<T>::Create(*this);
if (AutoRegister) if (AutoRegister)
RegisterPtr(PtrID,x); RegisterPtr(PtrID,x);
@ -186,10 +186,10 @@ public:
SerializedPtrID ID1 = ReadPtrID(); SerializedPtrID ID1 = ReadPtrID();
SerializedPtrID ID2 = ReadPtrID(); SerializedPtrID ID2 = ReadPtrID();
P1 = (ID1) ? SerializeTrait<T1>::Materialize(*this) : NULL; P1 = (ID1) ? SerializeTrait<T1>::Create(*this) : NULL;
if (ID1 && A1) RegisterPtr(ID1,P1); if (ID1 && A1) RegisterPtr(ID1,P1);
P2 = (ID2) ? SerializeTrait<T2>::Materialize(*this) : NULL; P2 = (ID2) ? SerializeTrait<T2>::Create(*this) : NULL;
if (ID2 && A2) RegisterPtr(ID2,P2); if (ID2 && A2) RegisterPtr(ID2,P2);
} }
@ -201,13 +201,13 @@ public:
SerializedPtrID ID2 = ReadPtrID(); SerializedPtrID ID2 = ReadPtrID();
SerializedPtrID ID3 = ReadPtrID(); SerializedPtrID ID3 = ReadPtrID();
P1 = (ID1) ? SerializeTrait<T1>::Materialize(*this) : NULL; P1 = (ID1) ? SerializeTrait<T1>::Create(*this) : NULL;
if (ID1 && A1) RegisterPtr(ID1,P1); if (ID1 && A1) RegisterPtr(ID1,P1);
P2 = (ID2) ? SerializeTrait<T2>::Materialize(*this) : NULL; P2 = (ID2) ? SerializeTrait<T2>::Create(*this) : NULL;
if (ID2 && A2) RegisterPtr(ID2,P2); if (ID2 && A2) RegisterPtr(ID2,P2);
P3 = (ID3) ? SerializeTrait<T2>::Materialize(*this) : NULL; P3 = (ID3) ? SerializeTrait<T2>::Create(*this) : NULL;
if (ID3 && A3) RegisterPtr(ID3,P3); if (ID3 && A3) RegisterPtr(ID3,P3);
} }
@ -221,7 +221,7 @@ public:
for (unsigned i = 0; i < NumPtrs; ++i) { for (unsigned i = 0; i < NumPtrs; ++i) {
SerializedPtrID& PtrID = BatchIDVec[i]; SerializedPtrID& PtrID = BatchIDVec[i];
T* p = PtrID ? SerializeTrait<T>::Materialize(*this) : NULL; T* p = PtrID ? SerializeTrait<T>::Create(*this) : NULL;
if (PtrID && AutoRegister) if (PtrID && AutoRegister)
RegisterPtr(PtrID,p); RegisterPtr(PtrID,p);
@ -246,7 +246,7 @@ public:
for (unsigned i = 0; i < NumT1Ptrs; ++i) { for (unsigned i = 0; i < NumT1Ptrs; ++i) {
SerializedPtrID& PtrID = BatchIDVec[i]; SerializedPtrID& PtrID = BatchIDVec[i];
T1* p = PtrID ? SerializeTrait<T1>::Materialize(*this) : NULL; T1* p = PtrID ? SerializeTrait<T1>::Create(*this) : NULL;
if (PtrID && A1) if (PtrID && A1)
RegisterPtr(PtrID,p); RegisterPtr(PtrID,p);
@ -254,10 +254,10 @@ public:
Ptrs[i] = p; Ptrs[i] = p;
} }
P2 = (ID2) ? SerializeTrait<T2>::Materialize(*this) : NULL; P2 = (ID2) ? SerializeTrait<T2>::Create(*this) : NULL;
if (ID2 && A2) RegisterPtr(ID2,P2); if (ID2 && A2) RegisterPtr(ID2,P2);
P3 = (ID3) ? SerializeTrait<T3>::Materialize(*this) : NULL; P3 = (ID3) ? SerializeTrait<T3>::Create(*this) : NULL;
if (ID3 && A3) RegisterPtr(ID3,P3); if (ID3 && A3) RegisterPtr(ID3,P3);
} }
@ -273,7 +273,8 @@ public:
template <typename T> template <typename T>
void ReadPtr(T*& PtrRef, const SerializedPtrID& PtrID, bool AllowBackpatch = true) { void ReadPtr(T*& PtrRef, const SerializedPtrID& PtrID,
bool AllowBackpatch = true) {
ReadUIntPtr(reinterpret_cast<uintptr_t&>(PtrRef), PtrID, AllowBackpatch); ReadUIntPtr(reinterpret_cast<uintptr_t&>(PtrRef), PtrID, AllowBackpatch);
} }

2
llvm/include/llvm/Bitcode/Serialization.h
View File

@ -37,7 +37,7 @@ template <typename T>
struct SerializeTrait { struct SerializeTrait {
static inline void Emit(Serializer& S, const T& X) { X.Emit(S); } static inline void Emit(Serializer& S, const T& X) { X.Emit(S); }
static inline void Read(Deserializer& D, T& X) { X.Read(D); } static inline void Read(Deserializer& D, T& X) { X.Read(D); }
static inline T* Materialize(Deserializer& D) { return T::Materialize(D); } static inline T* Create(Deserializer& D) { return T::Create(D); }
}; };
#define SERIALIZE_INT_TRAIT(TYPE)\ #define SERIALIZE_INT_TRAIT(TYPE)\