PNaCl localmod mods in LLVM to 223109 (local files only)

lib/Bitcode/NaCl/Reader/NaClBitcodeHeader.cpp

 //===- NaClBitcodeHeader.cpp ----------------------------------------------===//
 //     PNaCl bitcode header reader.
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Bitcode/NaCl/NaClBitcodeHeader.h"
 #include "llvm/Bitcode/NaCl/NaClReaderWriter.h"
 #include "llvm/Bitcode/ReaderWriter.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/Format.h"
 #include "llvm/Support/raw_ostream.h"
-#include "llvm/Support/StreamableMemoryObject.h"
+#include "llvm/Support/StreamingMemoryObject.h"
 
 #include <limits>
 #include <cstring>
 #include <iomanip>
 
 using namespace llvm;
 
 NaClBitcodeHeaderField::NaClBitcodeHeaderField()
     : ID(kInvalid), FType(kBufferType), Len(0), Data(0) {}
 
@@ skipping 155 matching lines @@
     return true; // ReadPrefix sets UnsupportedMessage
   BufPtr += 2 * WordSize;
 
   if (ReadFields(BufPtr, BufEnd, NumFields, NumBytes))
     return true; // ReadFields sets UnsupportedMessage
   BufPtr += NumBytes;
   InstallFields();
   return false;
 }
 
-bool NaClBitcodeHeader::Read(StreamableMemoryObject *Bytes) {
+bool NaClBitcodeHeader::Read(MemoryObject *Bytes) {
   unsigned NumFields;
   unsigned NumBytes;
+  // First, read the prefix, which is 2 * WordSize, to determine the
+  // NumBytes and NumFields.
   {
     unsigned char Buffer[2 * WordSize];
-    if (Bytes->readBytes(0, sizeof(Buffer), Buffer))
+    if (Bytes->readBytes(Buffer, sizeof(Buffer), 0) != sizeof(Buffer))
       return UnsupportedError("Bitcode read failure");
     if (ReadPrefix(Buffer, Buffer + sizeof(Buffer), NumFields, NumBytes))
       return true; // ReadPrefix sets UnsupportedMessage
   }
+  // Then read the rest, starting after the 2 * WordSize of the prefix.
   uint8_t *Header = new uint8_t[NumBytes];
   bool failed =
-      Bytes->readBytes(2 * WordSize, NumBytes, Header) ||
+      Bytes->readBytes(Header, NumBytes, 2 * WordSize) != NumBytes ||
       ReadFields(Header, Header + NumBytes, NumFields, NumBytes);
   delete[] Header;
   if (failed)
     return UnsupportedError("Bitcode read failure");
   InstallFields();
   return false;
 }
 
 NaClBitcodeHeaderField *
 NaClBitcodeHeader::GetTaggedField(NaClBitcodeHeaderField::Tag ID) const {
@@ skipping 44 matching lines @@
                       << PNaClVersion << "\n";
     UnsupportedStream.flush();
   }
   if (Fields.size() != 1) {
     IsSupportedFlag = false;
     IsReadableFlag = false;
     if (!UpdatedUnsupportedMessage)
       UnsupportedMessage = "Unknown header field(s) found";
   }
 }