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

lib/Bitcode/NaCl/TestUtils/NaClBitcodeMunge.cpp

 //===--- Bitcode/NaCl/TestUtils/NaClBitcodeMunge.cpp - Bitcode Munger -----===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // Bitcode writer/munger implementation for testing.
@@ skipping 42 matching lines @@
   SetBID = -1;
   writeMungedData(Munges, MungesSize, AddHeader);
 
   std::string OutBuffer;
   raw_string_ostream BitcodeStrm(OutBuffer);
   for (SmallVectorImpl<char>::const_iterator
            Iter = StreamBuffer.begin(), IterEnd = StreamBuffer.end();
        Iter != IterEnd; ++Iter) {
     BitcodeStrm << *Iter;
   }
-  MungedInput.reset(MemoryBuffer::getMemBufferCopy(BitcodeStrm.str(),
-                                                   TestName));
+  MungedInput = MemoryBuffer::getMemBufferCopy(BitcodeStrm.str(), TestName);
 }
 
 void NaClBitcodeMunger::cleanupTest() {
   MungedInput.reset();
   assert(DumpStream && "Dump stream removed before cleanup!");
   DumpStream->flush();
   delete DumpStream;
   DumpStream = nullptr;
   Writer = nullptr;
 }
@@ skipping 266 matching lines @@
       ReportFatalError();
     }
   }
   return Abbrev;
 }
 
 bool NaClObjDumpMunger::runTestWithFlags(
     const char *Name, const uint64_t Munges[], size_t MungesSize,
     bool AddHeader, bool NoRecords, bool NoAssembly) {
   setupTest(Name, Munges, MungesSize, AddHeader);
+  // TODO(jvoung,kschimpf): Should NaClObjDump take a MemoryBufferRef
+  // like the parser?
   if (NaClObjDump(MungedInput.get(), *DumpStream, NoRecords, NoAssembly))
     FoundErrors = true;
   cleanupTest();
   return !FoundErrors;
 }
 
 bool NaClParseBitcodeMunger::runTest(
     const char *Name, const uint64_t Munges[], size_t MungesSize,
     bool VerboseErrors) {
   bool AddHeader = true;
   setupTest(Name, Munges, MungesSize, AddHeader);
   LLVMContext &Context = getGlobalContext();
   raw_ostream *VerboseStrm = VerboseErrors ? DumpStream : nullptr;
   ErrorOr<Module *> ModuleOrError =
-      NaClParseBitcodeFile(MungedInput.get(), Context, VerboseStrm);
+      NaClParseBitcodeFile(MungedInput->getMemBufferRef(), Context,
+                           VerboseStrm);
   if (ModuleOrError) {
     if (VerboseErrors)
       *DumpStream << "Successful parse!\n";
     delete ModuleOrError.get();
   } else {
     Error() << ModuleOrError.getError().message() << "\n";
   }
   cleanupTest();
   return !FoundErrors;
 }