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

lib/Bitcode/NaCl/TestUtils/NaClBitcodeMunge.cpp

Index: lib/Bitcode/NaCl/TestUtils/NaClBitcodeMunge.cpp
diff --git a/lib/Bitcode/NaCl/TestUtils/NaClBitcodeMunge.cpp b/lib/Bitcode/NaCl/TestUtils/NaClBitcodeMunge.cpp
index 7ed2dc8f3e875480681af7ab9c9b222ceb71e881..6cb093238bdd40abd6c7d41f6f46c5ac9802a14e 100644
--- a/lib/Bitcode/NaCl/TestUtils/NaClBitcodeMunge.cpp
+++ b/lib/Bitcode/NaCl/TestUtils/NaClBitcodeMunge.cpp
@@ -60,8 +60,7 @@ void NaClBitcodeMunger::setupTest(
        Iter != IterEnd; ++Iter) {
     BitcodeStrm << *Iter;
   }
-  MungedInput.reset(MemoryBuffer::getMemBufferCopy(BitcodeStrm.str(),
-                                                   TestName));
+  MungedInput = MemoryBuffer::getMemBufferCopy(BitcodeStrm.str(), TestName);
 }
 
 void NaClBitcodeMunger::cleanupTest() {
@@ -348,6 +347,8 @@ 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();
@@ -362,7 +363,8 @@ bool NaClParseBitcodeMunger::runTest(
   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";