Changes from 3.7 merge to files not in upstream

lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp

Index: lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp
diff --git a/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp b/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp
index c4cae2ca8165aaa73ddcda0a9bbaaf6036e54ee3..74ac475f84d8ada0680f928078b5ef4db6dd9222 100644
--- a/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp
+++ b/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp
@@ -342,8 +342,8 @@ namespace {
 // 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;
@@ -1830,6 +1830,11 @@ std::error_code NaClBitcodeReader::MaterializeModule(Module *M) {
   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();