Index: lib/Bitcode/Reader/BitstreamReader.cpp
===================================================================
--- lib/Bitcode/Reader/BitstreamReader.cpp
+++ lib/Bitcode/Reader/BitstreamReader.cpp
@@ -211,8 +211,21 @@
         report_fatal_error("Array element type can't be an Array or a Blob");
 
       // Read all the elements.
-      for (; NumElts; --NumElts)
-        Vals.push_back(readAbbreviatedField(*this, EltEnc));
+      switch (EltEnc.getEncoding()) {
+        default:
+          llvm_unreachable("Unexpected case");
+        case BitCodeAbbrevOp::Fixed:
+          for (; NumElts; --NumElts)
+            Vals.push_back(Read((unsigned)EltEnc.getEncodingData()));
+          break;
+        case BitCodeAbbrevOp::VBR:
+          for (; NumElts; --NumElts)
+            Vals.push_back(ReadVBR64((unsigned)EltEnc.getEncodingData()));
+          break;
+        case BitCodeAbbrevOp::Char6:
+          for (; NumElts; --NumElts)
+            Vals.push_back(BitCodeAbbrevOp::DecodeChar6(Read(6)));
+      }
       continue;
     }