From 3ba3a9b586b4590edb572ed05391fc737117ee27 Mon Sep 17 00:00:00 2001 From: Ted Kremenek Date: Tue, 13 Nov 2007 00:25:08 +0000 Subject: Renamed serialization method "Materialize" to "Create". This is an API change. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@44034 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Bitcode/Deserialize.h | 27 ++++++++++++++------------- include/llvm/Bitcode/Serialization.h | 2 +- 2 files changed, 15 insertions(+), 14 deletions(-) (limited to 'include/llvm/Bitcode') diff --git a/include/llvm/Bitcode/Deserialize.h b/include/llvm/Bitcode/Deserialize.h index 8013f66f36..0f745d9054 100644 --- a/include/llvm/Bitcode/Deserialize.h +++ b/include/llvm/Bitcode/Deserialize.h @@ -152,8 +152,8 @@ public: } template - inline T* Materialize() { - return SerializeTrait::Materialize(*this); + inline T* Create() { + return SerializeTrait::Create(*this); } char* ReadCStr(char* cstr = NULL, unsigned MaxLen=0, bool isNullTerm=true); @@ -166,7 +166,7 @@ public: if (!PtrID) return NULL; - T* x = SerializeTrait::Materialize(*this); + T* x = SerializeTrait::Create(*this); if (AutoRegister) RegisterPtr(PtrID,x); @@ -186,10 +186,10 @@ public: SerializedPtrID ID1 = ReadPtrID(); SerializedPtrID ID2 = ReadPtrID(); - P1 = (ID1) ? SerializeTrait::Materialize(*this) : NULL; + P1 = (ID1) ? SerializeTrait::Create(*this) : NULL; if (ID1 && A1) RegisterPtr(ID1,P1); - P2 = (ID2) ? SerializeTrait::Materialize(*this) : NULL; + P2 = (ID2) ? SerializeTrait::Create(*this) : NULL; if (ID2 && A2) RegisterPtr(ID2,P2); } @@ -201,13 +201,13 @@ public: SerializedPtrID ID2 = ReadPtrID(); SerializedPtrID ID3 = ReadPtrID(); - P1 = (ID1) ? SerializeTrait::Materialize(*this) : NULL; + P1 = (ID1) ? SerializeTrait::Create(*this) : NULL; if (ID1 && A1) RegisterPtr(ID1,P1); - P2 = (ID2) ? SerializeTrait::Materialize(*this) : NULL; + P2 = (ID2) ? SerializeTrait::Create(*this) : NULL; if (ID2 && A2) RegisterPtr(ID2,P2); - P3 = (ID3) ? SerializeTrait::Materialize(*this) : NULL; + P3 = (ID3) ? SerializeTrait::Create(*this) : NULL; if (ID3 && A3) RegisterPtr(ID3,P3); } @@ -221,7 +221,7 @@ public: for (unsigned i = 0; i < NumPtrs; ++i) { SerializedPtrID& PtrID = BatchIDVec[i]; - T* p = PtrID ? SerializeTrait::Materialize(*this) : NULL; + T* p = PtrID ? SerializeTrait::Create(*this) : NULL; if (PtrID && AutoRegister) RegisterPtr(PtrID,p); @@ -246,7 +246,7 @@ public: for (unsigned i = 0; i < NumT1Ptrs; ++i) { SerializedPtrID& PtrID = BatchIDVec[i]; - T1* p = PtrID ? SerializeTrait::Materialize(*this) : NULL; + T1* p = PtrID ? SerializeTrait::Create(*this) : NULL; if (PtrID && A1) RegisterPtr(PtrID,p); @@ -254,10 +254,10 @@ public: Ptrs[i] = p; } - P2 = (ID2) ? SerializeTrait::Materialize(*this) : NULL; + P2 = (ID2) ? SerializeTrait::Create(*this) : NULL; if (ID2 && A2) RegisterPtr(ID2,P2); - P3 = (ID3) ? SerializeTrait::Materialize(*this) : NULL; + P3 = (ID3) ? SerializeTrait::Create(*this) : NULL; if (ID3 && A3) RegisterPtr(ID3,P3); } @@ -273,7 +273,8 @@ public: template - void ReadPtr(T*& PtrRef, const SerializedPtrID& PtrID, bool AllowBackpatch = true) { + void ReadPtr(T*& PtrRef, const SerializedPtrID& PtrID, + bool AllowBackpatch = true) { ReadUIntPtr(reinterpret_cast(PtrRef), PtrID, AllowBackpatch); } diff --git a/include/llvm/Bitcode/Serialization.h b/include/llvm/Bitcode/Serialization.h index 31220a6ec3..2a561f4679 100644 --- a/include/llvm/Bitcode/Serialization.h +++ b/include/llvm/Bitcode/Serialization.h @@ -37,7 +37,7 @@ template struct SerializeTrait { 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 T* Materialize(Deserializer& D) { return T::Materialize(D); } + static inline T* Create(Deserializer& D) { return T::Create(D); } }; #define SERIALIZE_INT_TRAIT(TYPE)\ -- cgit v1.2.3