diff options
| author | Adrian Prantl <aprantl@apple.com> | 2014-11-05 01:01:30 +0000 |
|---|---|---|
| committer | Adrian Prantl <aprantl@apple.com> | 2014-11-05 01:01:30 +0000 |
| commit | 65d5d00cb7775ed53f551828e557b85ad4a26591 (patch) | |
| tree | 1a26b1963218da3e58fbcc032c01633b03e99f9d | |
| parent | bf7550e7ecabb10e7a17e6d5067aa8c87810b46b (diff) | |
| download | bcm5719-llvm-65d5d00cb7775ed53f551828e557b85ad4a26591.tar.gz bcm5719-llvm-65d5d00cb7775ed53f551828e557b85ad4a26591.zip | |
Debug info: Emit the correct type for the __FuncPtr field in a block
descriptor.
rdar://problem/15984431
llvm-svn: 221326
| -rw-r--r-- | clang/lib/CodeGen/CGDebugInfo.cpp | 6 | ||||
| -rw-r--r-- | clang/test/CodeGenObjC/debug-info-block-type.m | 18 |
2 files changed, 22 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp index 05df1703051..ea8002ab969 100644 --- a/clang/lib/CodeGen/CGDebugInfo.cpp +++ b/clang/lib/CodeGen/CGDebugInfo.cpp @@ -714,7 +714,7 @@ llvm::DIType CGDebugInfo::CreateType(const BlockPointerType *Ty, FType = CGM.getContext().IntTy; EltTys.push_back(CreateMemberType(Unit, FType, "__flags", &FieldOffset)); EltTys.push_back(CreateMemberType(Unit, FType, "__reserved", &FieldOffset)); - FType = CGM.getContext().getPointerType(CGM.getContext().VoidTy); + FType = CGM.getContext().getPointerType(Ty->getPointeeType()); EltTys.push_back(CreateMemberType(Unit, FType, "__FuncPtr", &FieldOffset)); FType = CGM.getContext().getPointerType(CGM.getContext().VoidTy); @@ -2953,7 +2953,9 @@ void CGDebugInfo::EmitDeclareOfBlockLiteralArgVariable(const CGBlockInfo &block, fields.push_back(createFieldType("__reserved", C.IntTy, 0, loc, AS_public, blockLayout->getElementOffsetInBits(2), tunit, tunit)); - fields.push_back(createFieldType("__FuncPtr", C.VoidPtrTy, 0, loc, AS_public, + auto *FnTy = block.getBlockExpr()->getFunctionType(); + auto FnPtrType = CGM.getContext().getPointerType(FnTy->desugar()); + fields.push_back(createFieldType("__FuncPtr", FnPtrType, 0, loc, AS_public, blockLayout->getElementOffsetInBits(3), tunit, tunit)); fields.push_back(createFieldType( diff --git a/clang/test/CodeGenObjC/debug-info-block-type.m b/clang/test/CodeGenObjC/debug-info-block-type.m new file mode 100644 index 00000000000..e50163e626f --- /dev/null +++ b/clang/test/CodeGenObjC/debug-info-block-type.m @@ -0,0 +1,18 @@ +// RUN: %clang_cc1 -emit-llvm -fblocks -g -triple x86_64-apple-darwin14 -x objective-c < %s -o - | FileCheck %s +#define nil ((void*) 0) +typedef signed char BOOL; +// CHECK: ![[BOOL:[0-9]+]] = {{.*}} [ DW_TAG_typedef ] [BOOL] [line [[@LINE-1]] +// CHECK: ![[ID:[0-9]+]] = {{.*}} [ DW_TAG_typedef ] [id] + +typedef BOOL (^SomeKindOfPredicate)(id obj); +// CHECK: metadata ![[PTR:[0-9]+]]} ; [ DW_TAG_member ] [__FuncPtr] +// CHECK: ![[PTR]] = {{.*}}, metadata ![[FNTYPE:[0-9]+]]} ; [ DW_TAG_pointer_type ] +// CHECK: ![[FNTYPE]] = {{.*}} metadata ![[ARGS:[0-9]+]]{{.*}} ; [ DW_TAG_subroutine_type ] +// CHECK: ![[ARGS]] = metadata !{metadata ![[BOOL]], metadata ![[ID]]} + +int main() +{ + SomeKindOfPredicate p = ^BOOL(id obj) { return obj != nil; }; + // CHECK: metadata ![[PTR]]} ; [ DW_TAG_member ] [__FuncPtr] [line [[@LINE-1]], size 64, align 64, offset 128] + return p(nil); +} |
