1 files changed, 3 insertions, 1 deletions
diff --git a/lib/Bitcode/Reader/Deserialize.cpp b/lib/Bitcode/Reader/Deserialize.cpp
index 3e16027839..66df46ea23 100644
--- a/lib/Bitcode/Reader/Deserialize.cpp
+++ b/lib/Bitcode/Reader/Deserialize.cpp
@@ -126,7 +126,9 @@ void Deserializer::BackpatchPointers() {
     assert (Entry.Ptr && "No pointer found for backpatch.");
     
     for (BPatchNode* N = Entry.Head; N != NULL; N = N->Next)
-      N->PtrRef = Entry.Ptr;
+      // Bitwise-OR in the pointer to support "smart" pointers that use
+      // unused bits to store extra data.
+      N->PtrRef |= reinterpret_cast<uintptr_t>(Entry.Ptr);
     
     Entry.Head = NULL;
   }