diff --git a/llvm/lib/Bitcode/Reader/Deserialize.cpp b/llvm/lib/Bitcode/Reader/Deserialize.cpp
index 9caef6d..8fba9d2 100644
--- a/llvm/lib/Bitcode/Reader/Deserialize.cpp
+++ b/llvm/lib/Bitcode/Reader/Deserialize.cpp
@@ -22,8 +22,12 @@
 Deserializer::~Deserializer() {
   assert (RecIdx >= Record.size() && 
           "Still scanning bitcode record when deserialization completed.");
-  
-  assert (FreeList == NULL && "Some pointers were not backpatched.");
+ 
+#ifdef NDEBUG
+  for (MapTy::iterator I=BPatchMap.begin(), E=BPatchMap.end(); I!=E; ++I)
+    assert (I->second.hasFinalPtr() &&
+            "Some pointers were not backpatched.");
+#endif
 }