Changes from 3.7 merge to files not in upstream

include/llvm/Analysis/NaCl/PNaClAllowedIntrinsics.h

Index: include/llvm/Analysis/NaCl/PNaClAllowedIntrinsics.h
diff --git a/include/llvm/Analysis/NaCl/PNaClAllowedIntrinsics.h b/include/llvm/Analysis/NaCl/PNaClAllowedIntrinsics.h
index ecb99ef818a49bf9160c5ce69a38e3495a5857b4..f9b7e669b5f8fd0067843d4abf3b7161a23ff947 100644
--- a/include/llvm/Analysis/NaCl/PNaClAllowedIntrinsics.h
+++ b/include/llvm/Analysis/NaCl/PNaClAllowedIntrinsics.h
@@ -25,8 +25,8 @@ class FunctionType;
 
 // Holds the set of allowed instrinsics.
 class PNaClAllowedIntrinsics {
-  PNaClAllowedIntrinsics(const PNaClAllowedIntrinsics&) LLVM_DELETED_FUNCTION;
-  void operator=(const PNaClAllowedIntrinsics&) LLVM_DELETED_FUNCTION;
+  PNaClAllowedIntrinsics(const PNaClAllowedIntrinsics&) = delete;
+  void operator=(const PNaClAllowedIntrinsics&) = delete;
 public:
   PNaClAllowedIntrinsics(LLVMContext *Context);
 
@@ -47,6 +47,8 @@ public:
     return isIntrinsicName(Name) ? TypeMap[Name] : 0;
   }
 
+  static bool isAllowedDebugInfoIntrinsic(unsigned IntrinsicID);
+
 private:
   LLVMContext *Context;
   // Maps from an allowed intrinsic's name to its type.