Added special treatment of serializing NULL pointers.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@43357 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/llvm/Bitcode/Deserialize.h b/include/llvm/Bitcode/Deserialize.h
index f5adcff..164c70a 100644
--- a/include/llvm/Bitcode/Deserialize.h
+++ b/include/llvm/Bitcode/Deserialize.h
@@ -86,6 +86,10 @@
template <typename T>
inline T* ReadOwnedPtr() {
unsigned PtrId = ReadInt();
+
+ if (PtrId == 0)
+ return NULL;
+
T* x = SerializeTrait<T>::Materialize(*this);
RegisterPtr(PtrId,x);
return x;
diff --git a/include/llvm/Bitcode/Serialize.h b/include/llvm/Bitcode/Serialize.h
index dc1fe64..72aac9d 100644
--- a/include/llvm/Bitcode/Serialize.h
+++ b/include/llvm/Bitcode/Serialize.h
@@ -47,7 +47,7 @@
template <typename T>
void EmitOwnedPtr(T* ptr) {
EmitPtr(ptr);
- SerializeTrait<T>::Emit(*this,*ptr);
+ if (ptr) SerializeTrait<T>::Emit(*this,*ptr);
}
void Flush() { if (inRecord()) EmitRecord(); }
diff --git a/lib/Bitcode/Reader/Deserialize.cpp b/lib/Bitcode/Reader/Deserialize.cpp
index febb2d7..d1d6ef0 100644
--- a/lib/Bitcode/Reader/Deserialize.cpp
+++ b/lib/Bitcode/Reader/Deserialize.cpp
@@ -103,6 +103,11 @@
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/lib/Bitcode/Writer/Serialize.cpp b/lib/Bitcode/Writer/Serialize.cpp
index fbe1d10..a1d7320 100644
--- a/lib/Bitcode/Writer/Serialize.cpp
+++ b/lib/Bitcode/Writer/Serialize.cpp
@@ -58,10 +58,13 @@
}
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;
}