Changes from 3.7 merge to files not in upstream

lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp

 //===- 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.
 //
 //===----------------------------------------------------------------------===//
 
@@ skipping 324 matching lines @@
 
 namespace {
 
 // Class to process globals in two passes. In the first pass, build
 // the corresponding global variables with no initializers. In the
 // second pass, add initializers. The purpose of putting off
 // initializers is to make sure that we don't need to generate
 // placeholders for relocation records, and the corresponding cost
 // of duplicating initializers when these placeholders are replaced.
 class ParseGlobalsHandler {
-  ParseGlobalsHandler(const ParseGlobalsHandler &H) LLVM_DELETED_FUNCTION;
-  void operator=(const ParseGlobalsHandler &H) LLVM_DELETED_FUNCTION;
+  ParseGlobalsHandler(const ParseGlobalsHandler &H) = delete;
+  void operator=(const ParseGlobalsHandler &H) = delete;
 
   NaClBitcodeReader &Reader;
   NaClBitcodeReaderValueList &ValueList;
   NaClBitstreamCursor &Stream;
   LLVMContext &Context;
   Module *TheModule;
 
   // Holds read data record.
   SmallVector<uint64_t, 64> Record;
   // True when processing a global variable. Stays true until all records
@@ skipping 1466 matching lines @@
       if (!I->first->use_empty())
         I->first->replaceAllUsesWith(I->second);
       I->first->eraseFromParent();
     }
   }
   std::vector<std::pair<Function*, Function*> >().swap(UpgradedIntrinsics);
 
   return std::error_code();
 }
 
+std::vector<StructType *> NaClBitcodeReader::getIdentifiedStructTypes() const {
+  // MERGETODO(dschuff): does this need to contain anything for TypeFinder?

[jvoung (off chromium), 2015/05/26 20:39:45]

can this TODO be removed now -- replace with comment about PNaCl restrictions?

[Derek Schuff, 2015/05/26 22:01:32]

Done.

+  return std::vector<StructType *>();
+}
+
 std::error_code NaClBitcodeReader::InitStream() {
   if (LazyStreamer)
     return InitLazyStream();
   return InitStreamFromBuffer();
 }
 
 std::error_code NaClBitcodeReader::InitStreamFromBuffer() {
   const unsigned char *BufPtr = (const unsigned char*)Buffer->getBufferStart();
   const unsigned char *BufEnd = BufPtr+Buffer->getBufferSize();
 
@@ skipping 91 matching lines @@
   if (std::error_code EC = M->materializeAllPermanently()) {
     delete M;
     return EC;
   }
 
   // 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;
 }