Changes from 3.7 merge to files not in upstream

lib/Transforms/NaCl/RewriteLLVMIntrinsics.cpp

 //===- RewriteLLVMIntrinsics.cpp - Rewrite LLVM intrinsics to other values ===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This pass replaces calls to LLVM intrinsics that are *not* part of the
@@ skipping 36 matching lines @@
     IntrinsicRewriter(Module &M, Intrinsic::ID IntrinsicID)
         : F(Intrinsic::getDeclaration(&M, IntrinsicID)) {}
     virtual ~IntrinsicRewriter() {}
     /// This pure virtual method must be defined by implementors, and
     /// will be called by rewriteCall.
     virtual void doRewriteCall(CallInst *Call) = 0;
 
     Function *F;
 
   private:
-    IntrinsicRewriter() LLVM_DELETED_FUNCTION;
-    IntrinsicRewriter(const IntrinsicRewriter &) LLVM_DELETED_FUNCTION;
-    IntrinsicRewriter &operator=(
-        const IntrinsicRewriter &) LLVM_DELETED_FUNCTION;
+    IntrinsicRewriter() = delete;
+    IntrinsicRewriter(const IntrinsicRewriter &) = delete;
+    IntrinsicRewriter &operator=(const IntrinsicRewriter &) = delete;
   };
 
 private:
   /// Visit all uses of a Function, rewrite it using the \p Rewriter,
   /// and then delete the Call. Later delete the Function from the
   /// Module. Returns true if the Module was changed.
   bool visitUses(IntrinsicRewriter &Rewriter);
 };
 
 /// Rewrite a Call to nothing.
@@ skipping 70 matching lines @@
       Call->eraseFromParent();
   }
 
   F->eraseFromParent();
   return !Calls.empty();
 }
 
 ModulePass *llvm::createRewriteLLVMIntrinsicsPass() {
   return new RewriteLLVMIntrinsics();
 }