diff --git a/clang/lib/CodeGen/CGCall.cpp b/clang/lib/CodeGen/CGCall.cpp
index c1106c52d4b7a6c557da133c1faf9579b6bbc16d..cb4ccb22ebd5150f5ba1607dedab3788920939d6 100644
--- a/clang/lib/CodeGen/CGCall.cpp
+++ b/clang/lib/CodeGen/CGCall.cpp
@@ -2085,25 +2085,6 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
   CS.setAttributes(Attrs);
   CS.setCallingConv(static_cast<llvm::CallingConv::ID>(CallingConv));
 
-  // add metadata for __attribute__((alloc_size(foo)))
-  if (TargetDecl) {
-    if (const AllocSizeAttr* Attr = TargetDecl->getAttr<AllocSizeAttr>()) {
-      SmallVector<llvm::Value*, 4> Args;
-      llvm::IntegerType *Ty = llvm::IntegerType::getInt32Ty(getLLVMContext());
-      bool isMethod = false;
-      if (const CXXMethodDecl *MDecl = dyn_cast<CXXMethodDecl>(TargetDecl))
-        isMethod = MDecl->isInstance();
-
-      for (AllocSizeAttr::args_iterator I = Attr->args_begin(),
-           E = Attr->args_end(); I != E; ++I) {
-        Args.push_back(llvm::ConstantInt::get(Ty, *I + isMethod));
-      }
-
-      llvm::MDNode *MD = llvm::MDNode::get(getLLVMContext(), Args);
-      CS.getInstruction()->setMetadata("alloc_size", MD);
-    }
-  }
-
   // In ObjC ARC mode with no ObjC ARC exception safety, tell the ARC
   // optimizer it can aggressively ignore unwind edges.
   if (CGM.getLangOpts().ObjCAutoRefCount)
diff --git a/clang/test/CodeGen/alloc_size.c b/clang/test/CodeGen/alloc_size.c
deleted file mode 100644
index 05aa8456ee105e8f109d168184ce5efa58565267..0000000000000000000000000000000000000000
--- a/clang/test/CodeGen/alloc_size.c
+++ /dev/null
@@ -1,11 +0,0 @@
-// RUN: %clang_cc1 %s -emit-llvm -o - | FileCheck %s
-
-void *my_recalloc(void *, unsigned, unsigned) __attribute__((alloc_size(2,3))); 
-
-// CHECK: @f
-void* f() {
-  // CHECK: call i8* @my_recalloc{{.*}}, !alloc_size !0
-  return my_recalloc(0, 11, 27);
-}
-
-// CHECK: !0 = metadata !{i32 1, i32 2}
diff --git a/clang/test/CodeGenCXX/alloc_size.cpp b/clang/test/CodeGenCXX/alloc_size.cpp
deleted file mode 100644
index 90273cc89306bffdc94f650fdf49e04487ef9594..0000000000000000000000000000000000000000
--- a/clang/test/CodeGenCXX/alloc_size.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-// RUN: %clang_cc1 %s -emit-llvm -o - | FileCheck %s
-
-struct foo {
-  void *my_alloc(unsigned) __attribute__((alloc_size(2)));
-  static void* static_alloc(unsigned) __attribute__((alloc_size(1)));
-};
-
-
-void* f(bool a) {
-  // CHECK: call i8* {{.*}}alloc{{.*}}, !alloc_size !0
-  // CHECK: call i8* {{.*}}static_alloc{{.*}}, !alloc_size !1
-  foo obj;
-  return a ? obj.my_alloc(2) :
-             foo::static_alloc(42);
-}
-
-// CHECK: !0 = metadata !{i32 1}
-// CHECK: !1 = metadata !{i32 0}