Copy LLVM bitcode reader to generate a PNaCl wire format reader.

lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp

-//===- BitcodeReader.cpp - Internal BitcodeReader implementation ----------===//
+//===- NaClBitcodeReader.cpp ----------------------------------------------===//
+//     Internal NaClBitcodeReader implementation
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Bitcode/ReaderWriter.h"
-#include "BitcodeReader.h"
+#include "llvm/Bitcode/NaCl/NaClReaderWriter.h"
+#include "NaClBitcodeReader.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/AutoUpgrade.h"
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/DerivedTypes.h"
 #include "llvm/IR/InlineAsm.h"
 #include "llvm/IR/IntrinsicInst.h"
 #include "llvm/IR/Module.h"
 #include "llvm/IR/OperandTraits.h"
 #include "llvm/IR/Operator.h"
 #include "llvm/Support/DataStream.h"
 #include "llvm/Support/MathExtras.h"
 #include "llvm/Support/MemoryBuffer.h"
 using namespace llvm;
 
 enum {
   SWITCH_INST_MAGIC = 0x4B5 // May 2012 => 1205 => Hex
 };
 
-void BitcodeReader::materializeForwardReferencedFunctions() {
+void NaClBitcodeReader::materializeForwardReferencedFunctions() {
   while (!BlockAddrFwdRefs.empty()) {
     Function *F = BlockAddrFwdRefs.begin()->first;
     F->Materialize();
   }
 }
 
-void BitcodeReader::FreeState() {
+void NaClBitcodeReader::FreeState() {
   if (BufferOwned)
     delete Buffer;
   Buffer = 0;
   std::vector<Type*>().swap(TypeList);
   ValueList.clear();
   MDValueList.clear();
 
   std::vector<AttributeSet>().swap(MAttributes);
   std::vector<BasicBlock*>().swap(FunctionBBs);
   std::vector<Function*>().swap(FunctionsWithBodies);
@@ skipping 170 matching lines @@
 }
 
 // FIXME: can we inherit this from ConstantExpr?
 template <>
 struct OperandTraits<ConstantPlaceHolder> :
   public FixedNumOperandTraits<ConstantPlaceHolder, 1> {
 };
 }
 
 
-void BitcodeReaderValueList::AssignValue(Value *V, unsigned Idx) {
+void NaClBitcodeReaderValueList::AssignValue(Value *V, unsigned Idx) {
   if (Idx == size()) {
     push_back(V);
     return;
   }
 
   if (Idx >= size())
     resize(Idx+1);
 
   WeakVH &OldV = ValuePtrs[Idx];
   if (OldV == 0) {
     OldV = V;
     return;
   }
 
   // Handle constants and non-constants (e.g. instrs) differently for
   // efficiency.
   if (Constant *PHC = dyn_cast<Constant>(&*OldV)) {
     ResolveConstants.push_back(std::make_pair(PHC, Idx));
     OldV = V;
   } else {
     // If there was a forward reference to this value, replace it.
     Value *PrevVal = OldV;
     OldV->replaceAllUsesWith(V);
     delete PrevVal;
   }
 }
 
 
-Constant *BitcodeReaderValueList::getConstantFwdRef(unsigned Idx,
+Constant *NaClBitcodeReaderValueList::getConstantFwdRef(unsigned Idx,
                                                     Type *Ty) {
   if (Idx >= size())
     resize(Idx + 1);
 
   if (Value *V = ValuePtrs[Idx]) {
     assert(Ty == V->getType() && "Type mismatch in constant table!");
     return cast<Constant>(V);
   }
 
   // Create and return a placeholder, which will later be RAUW'd.
   Constant *C = new ConstantPlaceHolder(Ty, Context);
   ValuePtrs[Idx] = C;
   return C;
 }
 
-Value *BitcodeReaderValueList::getValueFwdRef(unsigned Idx, Type *Ty) {
+Value *NaClBitcodeReaderValueList::getValueFwdRef(unsigned Idx, Type *Ty) {
   if (Idx >= size())
     resize(Idx + 1);
 
   if (Value *V = ValuePtrs[Idx]) {
     assert((Ty == 0 || Ty == V->getType()) && "Type mismatch in value table!");
     return V;
   }
 
   // No type specified, must be invalid reference.
   if (Ty == 0) return 0;
 
   // Create and return a placeholder, which will later be RAUW'd.
   Value *V = new Argument(Ty);
   ValuePtrs[Idx] = V;
   return V;
 }
 
 /// ResolveConstantForwardRefs - Once all constants are read, this method bulk
 /// resolves any forward references.  The idea behind this is that we sometimes
 /// get constants (such as large arrays) which reference *many* forward ref
 /// constants.  Replacing each of these causes a lot of thrashing when
 /// building/reuniquing the constant.  Instead of doing this, we look at all the
 /// uses and rewrite all the place holders at once for any constant that uses
 /// a placeholder.
-void BitcodeReaderValueList::ResolveConstantForwardRefs() {
+void NaClBitcodeReaderValueList::ResolveConstantForwardRefs() {
   // Sort the values by-pointer so that they are efficient to look up with a
   // binary search.
   std::sort(ResolveConstants.begin(), ResolveConstants.end());
 
   SmallVector<Constant*, 64> NewOps;
 
   while (!ResolveConstants.empty()) {
     Value *RealVal = operator[](ResolveConstants.back().second);
     Constant *Placeholder = ResolveConstants.back().first;
     ResolveConstants.pop_back();
@@ skipping 54 matching lines @@
       UserC->destroyConstant();
       NewOps.clear();
     }
 
     // Update all ValueHandles, they should be the only users at this point.
     Placeholder->replaceAllUsesWith(RealVal);
     delete Placeholder;
   }
 }
 
-void BitcodeReaderMDValueList::AssignValue(Value *V, unsigned Idx) {
+void NaClBitcodeReaderMDValueList::AssignValue(Value *V, unsigned Idx) {
   if (Idx == size()) {
     push_back(V);
     return;
   }
 
   if (Idx >= size())
     resize(Idx+1);
 
   WeakVH &OldV = MDValuePtrs[Idx];
   if (OldV == 0) {
     OldV = V;
     return;
   }
 
   // If there was a forward reference to this value, replace it.
   MDNode *PrevVal = cast<MDNode>(OldV);
   OldV->replaceAllUsesWith(V);
   MDNode::deleteTemporary(PrevVal);
   // Deleting PrevVal sets Idx value in MDValuePtrs to null. Set new
   // value for Idx.
   MDValuePtrs[Idx] = V;
 }
 
-Value *BitcodeReaderMDValueList::getValueFwdRef(unsigned Idx) {
+Value *NaClBitcodeReaderMDValueList::getValueFwdRef(unsigned Idx) {
   if (Idx >= size())
     resize(Idx + 1);
 
   if (Value *V = MDValuePtrs[Idx]) {
     assert(V->getType()->isMetadataTy() && "Type mismatch in value table!");
     return V;
   }
 
   // Create and return a placeholder, which will later be RAUW'd.
   Value *V = MDNode::getTemporary(Context, ArrayRef<Value*>());
   MDValuePtrs[Idx] = V;
   return V;
 }
 
-Type *BitcodeReader::getTypeByID(unsigned ID) {
+Type *NaClBitcodeReader::getTypeByID(unsigned ID) {
   // The type table size is always specified correctly.
   if (ID >= TypeList.size())
     return 0;
 
   if (Type *Ty = TypeList[ID])
     return Ty;
 
   // If we have a forward reference, the only possible case is when it is to a
   // named struct.  Just create a placeholder for now.
   return TypeList[ID] = StructType::create(Context);
@@ skipping 17 matching lines @@
   unsigned Alignment = (EncodedAttrs & (0xffffULL << 16)) >> 16;
   assert((!Alignment || isPowerOf2_32(Alignment)) &&
          "Alignment must be a power of two.");
 
   if (Alignment)
     B.addAlignmentAttr(Alignment);
   B.addRawValue(((EncodedAttrs & (0xfffffULL << 32)) >> 11) |
                 (EncodedAttrs & 0xffff));
 }
 
-bool BitcodeReader::ParseAttributeBlock() {
+bool NaClBitcodeReader::ParseAttributeBlock() {
   if (Stream.EnterSubBlock(bitc::PARAMATTR_BLOCK_ID))
     return Error("Malformed block record");
 
   if (!MAttributes.empty())
     return Error("Multiple PARAMATTR blocks found!");
 
   SmallVector<uint64_t, 64> Record;
 
   SmallVector<AttributeSet, 8> Attrs;
 
   // Read all the records.
   while (1) {
     BitstreamEntry Entry = Stream.advanceSkippingSubblocks();

[jvoung (off chromium), 2013/04/29 18:02:08]

See question in header file about making it NaClBitstreamEntry or not.

[Karl, 2013/04/29 20:44:37]

Done.

 
     switch (Entry.Kind) {
     case BitstreamEntry::SubBlock: // Handled for us already.
     case BitstreamEntry::Error:
       return Error("Error at end of PARAMATTR block");
     case BitstreamEntry::EndBlock:
       return false;
     case BitstreamEntry::Record:
       // The interesting case.
       break;
@@ skipping 24 matching lines @@
         Attrs.push_back(MAttributeGroups[Record[i]]);
 
       MAttributes.push_back(AttributeSet::get(Context, Attrs));
       Attrs.clear();
       break;
     }
     }
   }
 }
 
-bool BitcodeReader::ParseAttributeGroupBlock() {
+bool NaClBitcodeReader::ParseAttributeGroupBlock() {
   if (Stream.EnterSubBlock(bitc::PARAMATTR_GROUP_BLOCK_ID))
     return Error("Malformed block record");
 
   if (!MAttributeGroups.empty())
     return Error("Multiple PARAMATTR_GROUP blocks found!");
 
   SmallVector<uint64_t, 64> Record;
 
   // Read all the records.
   while (1) {
@@ skipping 54 matching lines @@
         }
       }
 
       MAttributeGroups[GrpID] = AttributeSet::get(Context, Idx, B);
       break;
     }
     }
   }
 }
 
-bool BitcodeReader::ParseTypeTable() {
+bool NaClBitcodeReader::ParseTypeTable() {
   if (Stream.EnterSubBlock(bitc::TYPE_BLOCK_ID_NEW))
     return Error("Malformed block record");
 
   return ParseTypeTableBody();
 }
 
-bool BitcodeReader::ParseTypeTableBody() {
+bool NaClBitcodeReader::ParseTypeTableBody() {
   if (!TypeList.empty())
     return Error("Multiple TYPE_BLOCKs found!");
 
   SmallVector<uint64_t, 64> Record;
   unsigned NumRecords = 0;
 
   SmallString<64> TypeName;
 
   // Read all the records for this type table.
   while (1) {
@@ skipping 198 matching lines @@
     }
 
     if (NumRecords >= TypeList.size())
       return Error("invalid TYPE table");
     assert(ResultTy && "Didn't read a type?");
     assert(TypeList[NumRecords] == 0 && "Already read type?");
     TypeList[NumRecords++] = ResultTy;
   }
 }
 
-bool BitcodeReader::ParseValueSymbolTable() {
+bool NaClBitcodeReader::ParseValueSymbolTable() {
   if (Stream.EnterSubBlock(bitc::VALUE_SYMTAB_BLOCK_ID))
     return Error("Malformed block record");
 
   SmallVector<uint64_t, 64> Record;
 
   // Read all the records for this value table.
   SmallString<128> ValueName;
   while (1) {
     BitstreamEntry Entry = Stream.advanceSkippingSubblocks();
 
@@ skipping 33 matching lines @@
         return Error("Invalid BB ID in VST_BBENTRY record");
 
       BB->setName(StringRef(ValueName.data(), ValueName.size()));
       ValueName.clear();
       break;
     }
     }
   }
 }
 
-bool BitcodeReader::ParseMetadata() {
+bool NaClBitcodeReader::ParseMetadata() {
   unsigned NextMDValueNo = MDValueList.size();
 
   if (Stream.EnterSubBlock(bitc::METADATA_BLOCK_ID))
     return Error("Malformed block record");
 
   SmallVector<uint64_t, 64> Record;
 
   // Read all the records.
   while (1) {
     BitstreamEntry Entry = Stream.advanceSkippingSubblocks();
@@ skipping 79 matching lines @@
       if (!MDKindMap.insert(std::make_pair(Kind, NewKind)).second)
         return Error("Conflicting METADATA_KIND records");
       break;
     }
     }
   }
 }
 
 /// decodeSignRotatedValue - Decode a signed value stored with the sign bit in
 /// the LSB for dense VBR encoding.
-uint64_t BitcodeReader::decodeSignRotatedValue(uint64_t V) {
+uint64_t NaClBitcodeReader::decodeSignRotatedValue(uint64_t V) {
   if ((V & 1) == 0)
     return V >> 1;
   if (V != 1)
     return -(V >> 1);
   // There is no such thing as -0 with integers.  "-0" really means MININT.
   return 1ULL << 63;
 }
 
 /// ResolveGlobalAndAliasInits - Resolve all of the initializers for global
 /// values and aliases that we can.
-bool BitcodeReader::ResolveGlobalAndAliasInits() {
+bool NaClBitcodeReader::ResolveGlobalAndAliasInits() {
   std::vector<std::pair<GlobalVariable*, unsigned> > GlobalInitWorklist;
   std::vector<std::pair<GlobalAlias*, unsigned> > AliasInitWorklist;
 
   GlobalInitWorklist.swap(GlobalInits);
   AliasInitWorklist.swap(AliasInits);
 
   while (!GlobalInitWorklist.empty()) {
     unsigned ValID = GlobalInitWorklist.back().second;
     if (ValID >= ValueList.size()) {
       // Not ready to resolve this yet, it requires something later in the file.
@@ skipping 18 matching lines @@
         return Error("Alias initializer is not a constant!");
     }
     AliasInitWorklist.pop_back();
   }
   return false;
 }
 
 static APInt ReadWideAPInt(ArrayRef<uint64_t> Vals, unsigned TypeBits) {
   SmallVector<uint64_t, 8> Words(Vals.size());
   std::transform(Vals.begin(), Vals.end(), Words.begin(),
-                 BitcodeReader::decodeSignRotatedValue);
+                 NaClBitcodeReader::decodeSignRotatedValue);
 
   return APInt(TypeBits, Words);
 }
 
-bool BitcodeReader::ParseConstants() {
+bool NaClBitcodeReader::ParseConstants() {
   if (Stream.EnterSubBlock(bitc::CONSTANTS_BLOCK_ID))
     return Error("Malformed block record");
 
   SmallVector<uint64_t, 64> Record;
 
   // Read all the records for this value table.
   Type *CurTy = Type::getInt32Ty(Context);
   unsigned NextCstNo = ValueList.size();
   while (1) {
     BitstreamEntry Entry = Stream.advanceSkippingSubblocks();
@@ skipping 374 matching lines @@
       }
       break;
     }
     }
 
     ValueList.AssignValue(V, NextCstNo);
     ++NextCstNo;
   }
 }
 
-bool BitcodeReader::ParseUseLists() {
+bool NaClBitcodeReader::ParseUseLists() {
   if (Stream.EnterSubBlock(bitc::USELIST_BLOCK_ID))
     return Error("Malformed block record");
 
   SmallVector<uint64_t, 64> Record;
 
   // Read all the records.
   while (1) {
     BitstreamEntry Entry = Stream.advanceSkippingSubblocks();
 
     switch (Entry.Kind) {
@@ skipping 19 matching lines @@
       UseListRecords.push_back(Record);
       break;
     }
     }
   }
 }
 
 /// RememberAndSkipFunctionBody - When we see the block for a function body,
 /// remember where it is and then skip it.  This lets us lazily deserialize the
 /// functions.
-bool BitcodeReader::RememberAndSkipFunctionBody() {
+bool NaClBitcodeReader::RememberAndSkipFunctionBody() {
   // Get the function we are talking about.
   if (FunctionsWithBodies.empty())
     return Error("Insufficient function protos");
 
   Function *Fn = FunctionsWithBodies.back();
   FunctionsWithBodies.pop_back();
 
   // Save the current stream state.
   uint64_t CurBit = Stream.GetCurrentBitNo();
   DeferredFunctionInfo[Fn] = CurBit;
 
   // Skip over the function block for now.
   if (Stream.SkipBlock())
     return Error("Malformed block record");
   return false;
 }
 
-bool BitcodeReader::GlobalCleanup() {
+bool NaClBitcodeReader::GlobalCleanup() {
   // Patch the initializers for globals and aliases up.
   ResolveGlobalAndAliasInits();
   if (!GlobalInits.empty() || !AliasInits.empty())
     return Error("Malformed global initializer set");
 
   // Look for intrinsic functions which need to be upgraded at some point
   for (Module::iterator FI = TheModule->begin(), FE = TheModule->end();
        FI != FE; ++FI) {
     Function *NewFn;
     if (UpgradeIntrinsicFunction(FI, NewFn))
       UpgradedIntrinsics.push_back(std::make_pair(FI, NewFn));
   }
 
   // Look for global variables which need to be renamed.
   for (Module::global_iterator
          GI = TheModule->global_begin(), GE = TheModule->global_end();
        GI != GE; ++GI)
     UpgradeGlobalVariable(GI);
   // Force deallocation of memory for these vectors to favor the client that
   // want lazy deserialization.
   std::vector<std::pair<GlobalVariable*, unsigned> >().swap(GlobalInits);
   std::vector<std::pair<GlobalAlias*, unsigned> >().swap(AliasInits);
   return false;
 }
 
-bool BitcodeReader::ParseModule(bool Resume) {
+bool NaClBitcodeReader::ParseModule(bool Resume) {
   if (Resume)
     Stream.JumpToBit(NextUnreadBit);
   else if (Stream.EnterSubBlock(bitc::MODULE_BLOCK_ID))
     return Error("Malformed block record");
 
   SmallVector<uint64_t, 64> Record;
   std::vector<std::string> SectionTable;
   std::vector<std::string> GCTable;
 
   // Read all the records for this module.
@@ skipping 274 matching lines @@
       // Trim down the value list to the specified size.
       if (Record.size() < 1 || Record[0] > ValueList.size())
         return Error("Invalid MODULE_PURGEVALS record");
       ValueList.shrinkTo(Record[0]);
       break;
     }
     Record.clear();
   }
 }
 
-bool BitcodeReader::ParseBitcodeInto(Module *M) {
+bool NaClBitcodeReader::ParseBitcodeInto(Module *M) {
   TheModule = 0;
 
   if (InitStream()) return true;
 
   // Sniff for the signature.
   if (Stream.Read(8) != 'B' ||
       Stream.Read(8) != 'C' ||
       Stream.Read(4) != 0x0 ||
       Stream.Read(4) != 0xC ||
       Stream.Read(4) != 0xE ||
       Stream.Read(4) != 0xD)
     return Error("Invalid bitcode signature");
 
   // We expect a number of well-defined blocks, though we don't necessarily
   // need to understand them all.
   while (1) {
     if (Stream.AtEndOfStream())
       return false;
 
     BitstreamEntry Entry =
-      Stream.advance(BitstreamCursor::AF_DontAutoprocessAbbrevs);
+      Stream.advance(NaClBitstreamCursor::AF_DontAutoprocessAbbrevs);
 
     switch (Entry.Kind) {
     case BitstreamEntry::Error:
       Error("malformed module file");
       return true;
     case BitstreamEntry::EndBlock:
       return false;
 
     case BitstreamEntry::SubBlock:
       switch (Entry.ID) {
@@ skipping 25 matching lines @@
       if (Stream.getAbbrevIDWidth() == 2 && Entry.ID == 2 &&
           Stream.Read(6) == 2 && Stream.Read(24) == 0xa0a0a &&
           Stream.AtEndOfStream())
         return false;
 
       return Error("Invalid record at top-level");
     }
   }
 }
 
-bool BitcodeReader::ParseModuleTriple(std::string &Triple) {
+bool NaClBitcodeReader::ParseModuleTriple(std::string &Triple) {
   if (Stream.EnterSubBlock(bitc::MODULE_BLOCK_ID))
     return Error("Malformed block record");
 
   SmallVector<uint64_t, 64> Record;
 
   // Read all the records for this module.
   while (1) {
     BitstreamEntry Entry = Stream.advanceSkippingSubblocks();
 
     switch (Entry.Kind) {
@@ skipping 15 matching lines @@
       if (ConvertToString(Record, 0, S))
         return Error("Invalid MODULE_CODE_TRIPLE record");
       Triple = S;
       break;
     }
     }
     Record.clear();
   }
 }
 
-bool BitcodeReader::ParseTriple(std::string &Triple) {
+bool NaClBitcodeReader::ParseTriple(std::string &Triple) {
   if (InitStream()) return true;
 
   // Sniff for the signature.
   if (Stream.Read(8) != 'B' ||
       Stream.Read(8) != 'C' ||
       Stream.Read(4) != 0x0 ||
       Stream.Read(4) != 0xC ||
       Stream.Read(4) != 0xE ||
       Stream.Read(4) != 0xD)
     return Error("Invalid bitcode signature");
@@ skipping 22 matching lines @@
       continue;
 
     case BitstreamEntry::Record:
       Stream.skipRecord(Entry.ID);
       continue;
     }
   }
 }
 
 /// ParseMetadataAttachment - Parse metadata attachments.
-bool BitcodeReader::ParseMetadataAttachment() {
+bool NaClBitcodeReader::ParseMetadataAttachment() {
   if (Stream.EnterSubBlock(bitc::METADATA_ATTACHMENT_ID))
     return Error("Malformed block record");
 
   SmallVector<uint64_t, 64> Record;
   while (1) {
     BitstreamEntry Entry = Stream.advanceSkippingSubblocks();
 
     switch (Entry.Kind) {
     case BitstreamEntry::SubBlock: // Handled for us already.
     case BitstreamEntry::Error:
@@ skipping 24 matching lines @@
         Value *Node = MDValueList.getValueFwdRef(Record[i+1]);
         Inst->setMetadata(I->second, cast<MDNode>(Node));
       }
       break;
     }
     }
   }
 }
 
 /// ParseFunctionBody - Lazily parse the specified function body block.
-bool BitcodeReader::ParseFunctionBody(Function *F) {
+bool NaClBitcodeReader::ParseFunctionBody(Function *F) {
   if (Stream.EnterSubBlock(bitc::FUNCTION_BLOCK_ID))
     return Error("Malformed block record");
 
   InstructionList.clear();
   unsigned ModuleValueListSize = ValueList.size();
   unsigned ModuleMDValueListSize = MDValueList.size();
 
   // Add all the function arguments to the value table.
   for(Function::arg_iterator I = F->arg_begin(), E = F->arg_end(); I != E; ++I)
     ValueList.push_back(I);
@@ skipping 861 matching lines @@
   }
 
   // Trim the value list down to the size it was before we parsed this function.
   ValueList.shrinkTo(ModuleValueListSize);
   MDValueList.shrinkTo(ModuleMDValueListSize);
   std::vector<BasicBlock*>().swap(FunctionBBs);
   return false;
 }
 
 /// FindFunctionInStream - Find the function body in the bitcode stream
-bool BitcodeReader::FindFunctionInStream(Function *F,
+bool NaClBitcodeReader::FindFunctionInStream(Function *F,
        DenseMap<Function*, uint64_t>::iterator DeferredFunctionInfoIterator) {
   while (DeferredFunctionInfoIterator->second == 0) {
     if (Stream.AtEndOfStream())
       return Error("Could not find Function in stream");
     // ParseModule will parse the next body in the stream and set its
     // position in the DeferredFunctionInfo map.
     if (ParseModule(true)) return true;
   }
   return false;
 }
 
 //===----------------------------------------------------------------------===//
 // GVMaterializer implementation
 //===----------------------------------------------------------------------===//
 
 
-bool BitcodeReader::isMaterializable(const GlobalValue *GV) const {
+bool NaClBitcodeReader::isMaterializable(const GlobalValue *GV) const {
   if (const Function *F = dyn_cast<Function>(GV)) {
     return F->isDeclaration() &&
       DeferredFunctionInfo.count(const_cast<Function*>(F));
   }
   return false;
 }
 
-bool BitcodeReader::Materialize(GlobalValue *GV, std::string *ErrInfo) {
+bool NaClBitcodeReader::Materialize(GlobalValue *GV, std::string *ErrInfo) {
   Function *F = dyn_cast<Function>(GV);
   // If it's not a function or is already material, ignore the request.
   if (!F || !F->isMaterializable()) return false;
 
   DenseMap<Function*, uint64_t>::iterator DFII = DeferredFunctionInfo.find(F);
   assert(DFII != DeferredFunctionInfo.end() && "Deferred function not found!");
   // If its position is recorded as 0, its body is somewhere in the stream
   // but we haven't seen it yet.
   if (DFII->second == 0)
     if (LazyStreamer && FindFunctionInStream(F, DFII)) return true;
@@ skipping 14 matching lines @@
            UE = I->first->use_end(); UI != UE; ) {
         if (CallInst* CI = dyn_cast<CallInst>(*UI++))
           UpgradeIntrinsicCall(CI, I->second);
       }
     }
   }
 
   return false;
 }
 
-bool BitcodeReader::isDematerializable(const GlobalValue *GV) const {
+bool NaClBitcodeReader::isDematerializable(const GlobalValue *GV) const {
   const Function *F = dyn_cast<Function>(GV);
   if (!F || F->isDeclaration())
     return false;
   // @LOCALMOD-START
   // Don't dematerialize functions with BBs which have their address taken;
   // it will cause any referencing blockAddress constants to also be destroyed,
   // but because they are GVs, they need to stay around until PassManager
   // finalization.
   for (Function::const_iterator BB = F->begin(); BB != F->end(); ++BB) {
     if (BB->hasAddressTaken())
       return false;
   }
   // @LOCALMOD-END
   return DeferredFunctionInfo.count(const_cast<Function*>(F));
 }
 
-void BitcodeReader::Dematerialize(GlobalValue *GV) {
+void NaClBitcodeReader::Dematerialize(GlobalValue *GV) {
   Function *F = dyn_cast<Function>(GV);
   // If this function isn't dematerializable, this is a noop.
   if (!F || !isDematerializable(F))
     return;
 
   assert(DeferredFunctionInfo.count(F) && "No info to read function later?");
 
   // Just forget the function body, we can remat it later.
   F->deleteBody();
 }
 
 
-bool BitcodeReader::MaterializeModule(Module *M, std::string *ErrInfo) {
+bool NaClBitcodeReader::MaterializeModule(Module *M, std::string *ErrInfo) {
   assert(M == TheModule &&
-         "Can only Materialize the Module this BitcodeReader is attached to.");
+         "Can only Materialize the Module this NaClBitcodeReader is attached to.");
   // Iterate over the module, deserializing any functions that are still on
   // disk.
   for (Module::iterator F = TheModule->begin(), E = TheModule->end();
        F != E; ++F)
     if (F->isMaterializable() &&
         Materialize(F, ErrInfo))
       return true;
 
   // At this point, if there are any function bodies, the current bit is
   // pointing to the END_BLOCK record after them. Now make sure the rest
@@ skipping 16 matching lines @@
       if (!I->first->use_empty())
         I->first->replaceAllUsesWith(I->second);
       I->first->eraseFromParent();
     }
   }
   std::vector<std::pair<Function*, Function*> >().swap(UpgradedIntrinsics);
 
   return false;
 }
 
-bool BitcodeReader::InitStream() {
+bool NaClBitcodeReader::InitStream() {
   if (LazyStreamer) return InitLazyStream();
   return InitStreamFromBuffer();
 }
 
-bool BitcodeReader::InitStreamFromBuffer() {
+bool NaClBitcodeReader::InitStreamFromBuffer() {
   const unsigned char *BufPtr = (const unsigned char*)Buffer->getBufferStart();
   const unsigned char *BufEnd = BufPtr+Buffer->getBufferSize();
 
   if (Buffer->getBufferSize() & 3) {
-    if (!isRawBitcode(BufPtr, BufEnd) && !isBitcodeWrapper(BufPtr, BufEnd))
+    if (!isNaClRawBitcode(BufPtr, BufEnd) &&
+        !isNaClBitcodeWrapper(BufPtr, BufEnd))
       return Error("Invalid bitcode signature");
     else
       return Error("Bitcode stream should be a multiple of 4 bytes in length");
   }
 
   // If we have a wrapper header, parse it and ignore the non-bc file contents.
   // The magic number is 0x0B17C0DE stored in little endian.
-  if (isBitcodeWrapper(BufPtr, BufEnd))
-    if (SkipBitcodeWrapperHeader(BufPtr, BufEnd, true))
+  if (isNaClBitcodeWrapper(BufPtr, BufEnd))
+    if (SkipNaClBitcodeWrapperHeader(BufPtr, BufEnd, true))
       return Error("Invalid bitcode wrapper header");
 
-  StreamFile.reset(new BitstreamReader(BufPtr, BufEnd));
+  StreamFile.reset(new NaClBitstreamReader(BufPtr, BufEnd));
   Stream.init(*StreamFile);
 
   return false;
 }
 
-bool BitcodeReader::InitLazyStream() {
-  // Check and strip off the bitcode wrapper; BitstreamReader expects never to
-  // see it.
+bool NaClBitcodeReader::InitLazyStream() {
+  // Check and strip off the bitcode wrapper; NaClBitstreamReader expects
+  // never to see it.
   StreamingMemoryObject *Bytes = new StreamingMemoryObject(LazyStreamer);
-  StreamFile.reset(new BitstreamReader(Bytes));
+  StreamFile.reset(new NaClBitstreamReader(Bytes));
   Stream.init(*StreamFile);
 
   unsigned char buf[16];
   if (Bytes->readBytes(0, 16, buf, NULL) == -1)
     return Error("Bitcode stream must be at least 16 bytes in length");
 
-  if (!isBitcode(buf, buf + 16))
+  if (!isNaClBitcode(buf, buf + 16))
     return Error("Invalid bitcode signature");
 
-  if (isBitcodeWrapper(buf, buf + 4)) {
+  if (isNaClBitcodeWrapper(buf, buf + 4)) {
     const unsigned char *bitcodeStart = buf;
     const unsigned char *bitcodeEnd = buf + 16;
-    SkipBitcodeWrapperHeader(bitcodeStart, bitcodeEnd, false);
+    SkipNaClBitcodeWrapperHeader(bitcodeStart, bitcodeEnd, false);
     Bytes->dropLeadingBytes(bitcodeStart - buf);
     Bytes->setKnownObjectSize(bitcodeEnd - bitcodeStart);
   }
   return false;
 }
 
 //===----------------------------------------------------------------------===//
 // External interface
 //===----------------------------------------------------------------------===//
 
-/// getLazyBitcodeModule - lazy function-at-a-time loading from a file.
+/// getNaClLazyBitcodeModule - lazy function-at-a-time loading from a file.
 ///
-Module *llvm::getLazyBitcodeModule(MemoryBuffer *Buffer,
-                                   LLVMContext& Context,
-                                   std::string *ErrMsg) {
+Module *llvm::getNaClLazyBitcodeModule(MemoryBuffer *Buffer,
+                                       LLVMContext& Context,

[jvoung (off chromium), 2013/04/29 18:02:08]

tabs

[Karl, 2013/04/29 20:44:37]

Done.

+                                       std::string *ErrMsg) {
   Module *M = new Module(Buffer->getBufferIdentifier(), Context);
-  BitcodeReader *R = new BitcodeReader(Buffer, Context);
+  NaClBitcodeReader *R = new NaClBitcodeReader(Buffer, Context);
   M->setMaterializer(R);
   if (R->ParseBitcodeInto(M)) {
     if (ErrMsg)
       *ErrMsg = R->getErrorString();
 
     delete M;  // Also deletes R.
     return 0;
   }
-  // Have the BitcodeReader dtor delete 'Buffer'.
+  // Have the NaClBitcodeReader dtor delete 'Buffer'.
   R->setBufferOwned(true);
 
   R->materializeForwardReferencedFunctions();
 
   M->convertMetadataToLibraryList(); // @LOCALMOD
 
   return M;
 }
 
 
-Module *llvm::getStreamedBitcodeModule(const std::string &name,
-                                       DataStreamer *streamer,
-                                       LLVMContext &Context,
-                                       std::string *ErrMsg) {
+Module *llvm::getNaClStreamedBitcodeModule(const std::string &name,
+                                           DataStreamer *streamer,

[jvoung (off chromium), 2013/04/29 18:02:08]

tabs!

[Karl, 2013/04/29 20:44:37]

Done.

+                                           LLVMContext &Context,
+                                           std::string *ErrMsg) {
   Module *M = new Module(name, Context);
-  BitcodeReader *R = new BitcodeReader(streamer, Context);
+  NaClBitcodeReader *R = new NaClBitcodeReader(streamer, Context);
   M->setMaterializer(R);
   if (R->ParseBitcodeInto(M)) {
     if (ErrMsg)
       *ErrMsg = R->getErrorString();
     delete M;  // Also deletes R.
     return 0;
   }
   R->setBufferOwned(false); // no buffer to delete
 
   R->materializeForwardReferencedFunctions();
 
   M->convertMetadataToLibraryList(); // @LOCALMOD
 
   return M;
 }
 
-/// ParseBitcodeFile - Read the specified bitcode file, returning the module.
+/// NaClParseBitcodeFile - Read the specified bitcode file, returning the module.
 /// If an error occurs, return null and fill in *ErrMsg if non-null.
-Module *llvm::ParseBitcodeFile(MemoryBuffer *Buffer, LLVMContext& Context,
-                               std::string *ErrMsg){
-  Module *M = getLazyBitcodeModule(Buffer, Context, ErrMsg);
+Module *llvm::NaClParseBitcodeFile(MemoryBuffer *Buffer, LLVMContext& Context,
+                                   std::string *ErrMsg){

[jvoung (off chromium), 2013/04/29 18:02:08]

tabs

[Karl, 2013/04/29 20:44:37]

Done.

+  Module *M = getNaClLazyBitcodeModule(Buffer, Context, ErrMsg);
   if (!M) return 0;
 
-  // Don't let the BitcodeReader dtor delete 'Buffer', regardless of whether
+  // Don't let the NaClBitcodeReader dtor delete 'Buffer', regardless of whether
   // there was an error.
-  static_cast<BitcodeReader*>(M->getMaterializer())->setBufferOwned(false);
+  static_cast<NaClBitcodeReader*>(M->getMaterializer())->setBufferOwned(false);
 
-  // Read in the entire module, and destroy the BitcodeReader.
+  // Read in the entire module, and destroy the NaClBitcodeReader.
   if (M->MaterializeAllPermanently(ErrMsg)) {
     delete M;
     return 0;
   }
 
   // TODO: Restore the use-lists to the in-memory state when the bitcode was
   // written.  We must defer until the Module has been fully materialized.
 
   return M;
 }
-
-std::string llvm::getBitcodeTargetTriple(MemoryBuffer *Buffer,
-                                         LLVMContext& Context,
-                                         std::string *ErrMsg) {
-  BitcodeReader *R = new BitcodeReader(Buffer, Context);
-  // Don't let the BitcodeReader dtor delete 'Buffer'.
-  R->setBufferOwned(false);
-
-  std::string Triple("");
-  if (R->ParseTriple(Triple))

[jvoung (off chromium), 2013/04/29 18:02:08]

Any reason this is removed?

The NaClBitcodeReader's ParseTriple/ParseModuleTriple methods still exist.  Are
they used by anything else?  Looks like no, only getBitcodeTargetTriple is used
by libLTO.

[Karl, 2013/04/29 20:44:37]

As far as I can tell, only lto uses it, so thought it wasn't necessary. Hence, I
removed it.

[jvoung (off chromium), 2013/04/29 21:49:34]

Would have been a bit cleaner to do that separately, since you could also remove
ParseTriple and ParseModuleTriple?  Then again, as long as the writer writes out
a triple, it seems good to be able to read it back...

-    if (ErrMsg)
-      *ErrMsg = R->getErrorString();
-
-  delete R;
-  return Triple;
-}