From a83e6bc246410644cd17f34df93746d69abbfffc Mon Sep 17 00:00:00 2001 From: Ted Kremenek Date: Thu, 25 Oct 2007 18:42:52 +0000 Subject: Added special treatment of serializing NULL pointers. llvm-svn: 43357 --- llvm/lib/Bitcode/Reader/Deserialize.cpp | 5 +++++ llvm/lib/Bitcode/Writer/Serialize.cpp | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'llvm/lib/Bitcode') diff --git a/llvm/lib/Bitcode/Reader/Deserialize.cpp b/llvm/lib/Bitcode/Reader/Deserialize.cpp index febb2d7cafc..d1d6ef098f7 100644 --- a/llvm/lib/Bitcode/Reader/Deserialize.cpp +++ b/llvm/lib/Bitcode/Reader/Deserialize.cpp @@ -103,6 +103,11 @@ void Deserializer::RegisterPtr(unsigned PtrId,void* Ptr) { void Deserializer::ReadPtr(void*& PtrRef) { unsigned PtrId = ReadInt(); + if (PtrId == 0) { + PtrRef = NULL; + return; + } + BPatchEntry& E = BPatchMap[PtrId]; if (E.Ptr == NULL) { diff --git a/llvm/lib/Bitcode/Writer/Serialize.cpp b/llvm/lib/Bitcode/Writer/Serialize.cpp index fbe1d1007c9..a1d732047a6 100644 --- a/llvm/lib/Bitcode/Writer/Serialize.cpp +++ b/llvm/lib/Bitcode/Writer/Serialize.cpp @@ -58,10 +58,13 @@ void Serializer::EmitCStr(const char* s) { } unsigned Serializer::getPtrId(void* ptr) { + if (!ptr) + return 0; + MapTy::iterator I = PtrMap.find(ptr); if (I == PtrMap.end()) { - unsigned id = PtrMap.size(); + unsigned id = PtrMap.size()+1; PtrMap[ptr] = id; return id; } -- cgit v1.2.3