1 files changed, 15 insertions, 1 deletions
diff --git a/lib/Bitcode/Reader/Deserialize.cpp b/lib/Bitcode/Reader/Deserialize.cpp
index 31d180ff32..ef4e4f7e00 100644
--- a/lib/Bitcode/Reader/Deserialize.cpp
+++ b/lib/Bitcode/Reader/Deserialize.cpp
@@ -47,10 +47,15 @@ void Deserializer::ReadRecord() {
   // FIXME: Check if we haven't run off the edge of the stream.
   // FIXME: Handle abbreviations.
 
+  assert (Record.size() == 0);
+  
   unsigned Code;
 
   while (true) {
     
+    if (Stream.AtEndOfStream())
+      return;
+    
     Code = Stream.ReadCode();
   
     if (Code == bitc::ENTER_SUBBLOCK) {
@@ -71,7 +76,16 @@ void Deserializer::ReadRecord() {
   
   assert (Record.size() == 0);  
   Stream.ReadRecord(Code,Record);  
-  assert (Record.size() > 0);
+  assert (Record.size() > 0 || Stream.AtEndOfStream());
+}
+
+bool Deserializer::AtEnd() {
+  if (inRecord())
+    return false;
+  
+  ReadRecord();
+  
+  return Stream.AtEndOfStream();
 }
 
 uint64_t Deserializer::ReadInt() {