Changes from 3.7 merge to files not in upstream

include/llvm/Analysis/NaCl/PNaClABIVerifyFunctions.h

 //===- PNaClABIVerifyFunctions.h - Verify PNaCl ABI rules -----------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // Verify function-level PNaCl ABI requirements.
@@ skipping 10 matching lines @@
 #include "llvm/IR/DataLayout.h"
 #include "llvm/IR/Module.h"
 #include "llvm/IR/NaClAtomicIntrinsics.h"
 #include "llvm/Pass.h"
 
 namespace llvm {
 
 // Checks that examine anything in the function body should be in
 // FunctionPasses to make them streaming-friendly.
 class PNaClABIVerifyFunctions : public FunctionPass {
-  PNaClABIVerifyFunctions(const PNaClABIVerifyFunctions&) LLVM_DELETED_FUNCTION;
-  void operator=(const PNaClABIVerifyFunctions&) LLVM_DELETED_FUNCTION;
+  PNaClABIVerifyFunctions(const PNaClABIVerifyFunctions&) = delete;
+  void operator=(const PNaClABIVerifyFunctions&) = delete;
  public:
   static char ID;
   PNaClABIVerifyFunctions() :
       FunctionPass(ID),
       Reporter(new PNaClABIErrorReporter),
       ReporterIsOwned(true) {
     initializePNaClABIVerifyFunctionsPass(*PassRegistry::getPassRegistry());
   }
   explicit PNaClABIVerifyFunctions(PNaClABIErrorReporter *Reporter_) :
       FunctionPass(ID),
       Reporter(Reporter_),
       ReporterIsOwned(false) {
     initializePNaClABIVerifyFunctionsPass(*PassRegistry::getPassRegistry());
   }
   virtual ~PNaClABIVerifyFunctions();
   virtual bool doInitialization(Module &M) {
     AtomicIntrinsics.reset(new NaCl::AtomicIntrinsics(M.getContext()));
     return false;
   }
   virtual void getAnalysisUsage(AnalysisUsage &Info) const {
     Info.setPreservesAll();
-    Info.addRequired<DataLayoutPass>();
   }
   bool runOnFunction(Function &F);
   virtual void print(raw_ostream &O, const Module *M) const;
 
 private:
   const char *checkInstruction(const DataLayout *DL, const Instruction *Inst);
   PNaClABIErrorReporter *Reporter;
   bool ReporterIsOwned;
   std::unique_ptr<NaCl::AtomicIntrinsics> AtomicIntrinsics;
 };
 
 }
 
 #endif  // LLVM_ANALYSIS_NACL_PNACLABIVERIFYFUNCTIONS_H