diff --git a/include/llvm/Bitcode/Deserialize.h b/include/llvm/Bitcode/Deserialize.h index d7ad7c1614b..c83eea899e0 100644 --- a/include/llvm/Bitcode/Deserialize.h +++ b/include/llvm/Bitcode/Deserialize.h @@ -103,11 +103,6 @@ public: SerializeTrait::Read(*this,X); return X; } - - template - inline T ReadVal() { - return SerializeTrait::ReadVal(*this); - } template inline T* Materialize() { diff --git a/include/llvm/Bitcode/Serialization.h b/include/llvm/Bitcode/Serialization.h index 98351a08878..2e738b0ed37 100644 --- a/include/llvm/Bitcode/Serialization.h +++ b/include/llvm/Bitcode/Serialization.h @@ -37,15 +37,13 @@ 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 ReadVal(Deserializer& D) { T::ReadVal(D); } static inline T* Materialize(Deserializer& D) { return T::Materialize(D); } }; #define SERIALIZE_INT_TRAIT(TYPE)\ template <> struct SerializeTrait {\ static void Emit(Serializer& S, TYPE X);\ - static void Read(Deserializer& S, TYPE& X);\ - static TYPE ReadVal(Deserializer& S); }; + static void Read(Deserializer& S, TYPE& X); }; SERIALIZE_INT_TRAIT(bool) SERIALIZE_INT_TRAIT(unsigned char) diff --git a/lib/Bitcode/Reader/Deserialize.cpp b/lib/Bitcode/Reader/Deserialize.cpp index e5a4d18aa2b..0482b1f7e99 100644 --- a/lib/Bitcode/Reader/Deserialize.cpp +++ b/lib/Bitcode/Reader/Deserialize.cpp @@ -166,9 +166,7 @@ void Deserializer::BPEntry::SetPtr(BPNode*& FreeList, void* P) { #define INT_READ(TYPE)\ void SerializeTrait::Read(Deserializer& D, TYPE& X) {\ - X = (TYPE) D.ReadInt(); }\ -TYPE SerializeTrait::ReadVal(Deserializer& D) {\ - return (TYPE) D.ReadInt(); } + X = (TYPE) D.ReadInt(); } INT_READ(bool) INT_READ(unsigned char)