Changes from 3.7 merge to files not in upstream

lib/Bitcode/NaCl/Analysis/NaClCompress.cpp

Index: lib/Bitcode/NaCl/Analysis/NaClCompress.cpp
diff --git a/lib/Bitcode/NaCl/Analysis/NaClCompress.cpp b/lib/Bitcode/NaCl/Analysis/NaClCompress.cpp
index 6e02eaf7e8edffa891b09e8192a31b185a753f84..77225aadc2f6c50234a64e3d4398c1496b4f0655 100644
--- a/lib/Bitcode/NaCl/Analysis/NaClCompress.cpp
+++ b/lib/Bitcode/NaCl/Analysis/NaClCompress.cpp
@@ -465,10 +465,8 @@ static BlockAbbrevs *getAbbrevs(BlockAbbrevsMapType &AbbrevsMap,
 /// corresponding lists of global abbreviations to use in the
 /// generated (compressed) bitcode file.
 class NaClAnalyzeParser : public NaClBitcodeParser {
-  NaClAnalyzeParser(const NaClAnalyzeParser&)
-      LLVM_DELETED_FUNCTION;
-  void operator=(const NaClAnalyzeParser&)
-      LLVM_DELETED_FUNCTION;
+  NaClAnalyzeParser(const NaClAnalyzeParser&) = delete;
+  void operator=(const NaClAnalyzeParser&) = delete;
 
 public:
   // Creates the analysis parser, which will fill the given
@@ -503,10 +501,8 @@ public:
 };
 
 class NaClBlockAnalyzeParser : public NaClBitcodeParser {
-  NaClBlockAnalyzeParser(const NaClBlockAnalyzeParser&)
-      LLVM_DELETED_FUNCTION;
-  void operator=(NaClBlockAnalyzeParser&)
-      LLVM_DELETED_FUNCTION;
+  NaClBlockAnalyzeParser(const NaClBlockAnalyzeParser&) = delete;
+  void operator=(NaClBlockAnalyzeParser&) = delete;
 
 public:
   /// Top-level constructor to build the top-level block with the
@@ -652,7 +648,7 @@ bool NaClAnalyzeParser::ParseBlock(unsigned BlockID) {
 /// keep the array abbreviation op, for untracked elements within the
 /// distribution maps.
 class UnrolledAbbreviation {
-  void operator=(const UnrolledAbbreviation&) LLVM_DELETED_FUNCTION;
+  void operator=(const UnrolledAbbreviation&) = delete;
 public:
   /// Unroll the given abbreviation, assuming it has the given size
   /// (as specified in the distribution maps).