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

include/llvm/Bitcode/NaCl/NaClBitcodeHeader.h

 //===-- llvm/Bitcode/NaCl/NaClBitcodeHeader.h - ----------------*- C++ -*-===//
 //      NaCl Bitcode header reader.
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This header defines interfaces to read and write NaCl bitcode wire format
 // file headers.
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_BITCODE_NACL_NACLBITCODEHEADER_H
 #define LLVM_BITCODE_NACL_NACLBITCODEHEADER_H
 
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/DataTypes.h"
 #include <string>
 #include <vector>
 
 namespace llvm {
-class StreamableMemoryObject;
+class MemoryObject;
 
 // Class representing a variable-size metadata field in the bitcode header.
 // Also contains the list of known (typed) Tag IDs.
 //
 // The serialized format has 2 fixed subfields (ID:type and data length) and the
 // variable-length data subfield
 class NaClBitcodeHeaderField {
   NaClBitcodeHeaderField(const NaClBitcodeHeaderField &) LLVM_DELETED_FUNCTION;
   void operator=(const NaClBitcodeHeaderField &)LLVM_DELETED_FUNCTION;
 
@@ skipping 31 matching lines @@
 
   /// \brief Number of bytes used to represent header field.
   size_t GetTotalSize() const {
     // Round up to 4 byte alignment
     return (kTagLenSize + Len + (WordSize - 1)) & ~(WordSize - 1);
   }
 
   /// \brief Write field into Buf[BufLen].
   bool Write(uint8_t *Buf, size_t BufLen) const;
 
-  /// \brief Read field form Buf[BufLen].
+  /// \brief Read field from Buf[BufLen].
   bool Read(const uint8_t *Buf, size_t BufLen);
 
   /// \brief Returns string describing field.
   std::string Contents() const;
 
   /// \brief Get the data size from a serialized field to allow allocation.
   static size_t GetDataSizeFromSerialized(const uint8_t *Buf) {
     FixedSubfield Length;
     ReadFixedSubfield(&Length, Buf + sizeof(FixedSubfield));
     return Length;
@@ skipping 81 matching lines @@
   ///    4) NaClBitcodeHeaderField f1 - The first bitcode header field.
   ///    ...
   ///    2 + num_fields) NaClBitcodeHeaderField fn - The last bitcode header
   /// field.
   ///
   /// Returns false if able to read (all of) the bitcode header.
   bool Read(const unsigned char *&BufPtr, const unsigned char *&BufEnd);
 
   // \brief Read the PNaCl bitcode header, recording the fields found
   // in the header. Returns false if able to read (all of) the bitcode header.
-  bool Read(StreamableMemoryObject *Bytes);
+  bool Read(MemoryObject *Bytes);
 
   // \brief Returns the number of bytes read to consume the header.
   size_t getHeaderSize() { return HeaderSize; }
 
   /// \brief Returns string describing why the header describes
   /// an unsupported PNaCl Bitcode file.
   const std::string &Unsupported() const { return UnsupportedMessage; }
 
   /// \brief Returns true if supported. That is, it can be run in the
   /// browser.
@@ skipping 35 matching lines @@
   bool UnsupportedError(StringRef Message) {
     UnsupportedMessage = Message.str();
     return true;
   }
 
 };
 
 } // namespace llvm
 
 #endif