From: Nuno Lopes Date: Fri, 22 Jun 2012 18:01:38 +0000 (+0000) Subject: revert CodeGen support for the alloc_size attribute until we finish the design of... X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7e0dc76b175414ecdd9a6b26bdb548281da8bffd;p=clang revert CodeGen support for the alloc_size attribute until we finish the design of a more generic metadata node git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@159016 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/CodeGen/CGCall.cpp b/lib/CodeGen/CGCall.cpp index c1106c52d4..cb4ccb22eb 100644 --- a/lib/CodeGen/CGCall.cpp +++ b/lib/CodeGen/CGCall.cpp @@ -2085,25 +2085,6 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo, CS.setAttributes(Attrs); CS.setCallingConv(static_cast(CallingConv)); - // add metadata for __attribute__((alloc_size(foo))) - if (TargetDecl) { - if (const AllocSizeAttr* Attr = TargetDecl->getAttr()) { - SmallVector Args; - llvm::IntegerType *Ty = llvm::IntegerType::getInt32Ty(getLLVMContext()); - bool isMethod = false; - if (const CXXMethodDecl *MDecl = dyn_cast(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/test/CodeGen/alloc_size.c b/test/CodeGen/alloc_size.c deleted file mode 100644 index 05aa8456ee..0000000000 --- a/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/test/CodeGenCXX/alloc_size.cpp b/test/CodeGenCXX/alloc_size.cpp deleted file mode 100644 index 90273cc893..0000000000 --- a/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}