diff options
| -rw-r--r-- | lib/CodeGen/CGCall.cpp | 6 | ||||
| -rw-r--r-- | test/CodeGenCXX/alloc_size.cpp | 18 |
2 files changed, 22 insertions, 2 deletions
diff --git a/lib/CodeGen/CGCall.cpp b/lib/CodeGen/CGCall.cpp index 650fe8b623..cd01fa251c 100644 --- a/lib/CodeGen/CGCall.cpp +++ b/lib/CodeGen/CGCall.cpp @@ -2090,9 +2090,11 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo, // add metadata for __attribute__((alloc_size(foo))) if (TargetDecl) { if (const AllocSizeAttr* Attr = TargetDecl->getAttr<AllocSizeAttr>()) { - std::vector<llvm::Value*> Args; + SmallVector<llvm::Value*, 4> Args; llvm::IntegerType *Ty = llvm::IntegerType::getInt32Ty(getLLVMContext()); - bool isMethod = isa<CXXMethodDecl>(TargetDecl); + 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) { diff --git a/test/CodeGenCXX/alloc_size.cpp b/test/CodeGenCXX/alloc_size.cpp new file mode 100644 index 0000000000..90273cc893 --- /dev/null +++ b/test/CodeGenCXX/alloc_size.cpp @@ -0,0 +1,18 @@ +// 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} |