Skip to content

Commit 2b5cf04

Browse files
scott-linderscott-linder
committedJul 30, 2018
[DebugInfo][OpenCL] Generate correct block literal debug info for OpenCL
OpenCL block literal structs have different fields which are now correctly identified in the debug info. Differential Revision: https://reviews.llvm.org/D49930 llvm-svn: 338299
·
llvmorg-21-initllvmorg-7.0.0-rc1
1 parent b94d5f8 commit 2b5cf04

File tree

2 files changed

+58
-36
lines changed

2 files changed

+58
-36
lines changed
 

Diff for: ‎clang/lib/CodeGen/CGDebugInfo.cpp

+48-34
Original file line numberDiff line numberDiff line change
@@ -971,20 +971,25 @@ llvm::DIType *CGDebugInfo::CreateType(const BlockPointerType *Ty,
971971
auto *DescTy = DBuilder.createPointerType(EltTy, Size);
972972

973973
FieldOffset = 0;
974-
FType = CGM.getContext().getPointerType(CGM.getContext().VoidTy);
975-
EltTys.push_back(CreateMemberType(Unit, FType, "__isa", &FieldOffset));
976-
FType = CGM.getContext().IntTy;
977-
EltTys.push_back(CreateMemberType(Unit, FType, "__flags", &FieldOffset));
978-
EltTys.push_back(CreateMemberType(Unit, FType, "__reserved", &FieldOffset));
979-
FType = CGM.getContext().getPointerType(Ty->getPointeeType());
980-
EltTys.push_back(CreateMemberType(Unit, FType, "__FuncPtr", &FieldOffset));
981-
982-
FType = CGM.getContext().getPointerType(CGM.getContext().VoidTy);
983-
FieldSize = CGM.getContext().getTypeSize(Ty);
984-
FieldAlign = CGM.getContext().getTypeAlign(Ty);
985-
EltTys.push_back(DBuilder.createMemberType(
986-
Unit, "__descriptor", nullptr, LineNo, FieldSize, FieldAlign, FieldOffset,
987-
llvm::DINode::FlagZero, DescTy));
974+
if (CGM.getLangOpts().OpenCL) {
975+
FType = CGM.getContext().IntTy;
976+
EltTys.push_back(CreateMemberType(Unit, FType, "__size", &FieldOffset));
977+
EltTys.push_back(CreateMemberType(Unit, FType, "__align", &FieldOffset));
978+
} else {
979+
FType = CGM.getContext().getPointerType(CGM.getContext().VoidTy);
980+
EltTys.push_back(CreateMemberType(Unit, FType, "__isa", &FieldOffset));
981+
FType = CGM.getContext().IntTy;
982+
EltTys.push_back(CreateMemberType(Unit, FType, "__flags", &FieldOffset));
983+
EltTys.push_back(CreateMemberType(Unit, FType, "__reserved", &FieldOffset));
984+
FType = CGM.getContext().getPointerType(Ty->getPointeeType());
985+
EltTys.push_back(CreateMemberType(Unit, FType, "__FuncPtr", &FieldOffset));
986+
FType = CGM.getContext().getPointerType(CGM.getContext().VoidTy);
987+
FieldSize = CGM.getContext().getTypeSize(Ty);
988+
FieldAlign = CGM.getContext().getTypeAlign(Ty);
989+
EltTys.push_back(DBuilder.createMemberType(
990+
Unit, "__descriptor", nullptr, LineNo, FieldSize, FieldAlign, FieldOffset,
991+
llvm::DINode::FlagZero, DescTy));
992+
}
988993

989994
FieldOffset += FieldSize;
990995
Elements = DBuilder.getOrCreateArray(EltTys);
@@ -3847,26 +3852,35 @@ void CGDebugInfo::EmitDeclareOfBlockLiteralArgVariable(const CGBlockInfo &block,
38473852
CGM.getDataLayout().getStructLayout(block.StructureType);
38483853

38493854
SmallVector<llvm::Metadata *, 16> fields;
3850-
fields.push_back(createFieldType("__isa", C.VoidPtrTy, loc, AS_public,
3851-
blockLayout->getElementOffsetInBits(0),
3852-
tunit, tunit));
3853-
fields.push_back(createFieldType("__flags", C.IntTy, loc, AS_public,
3854-
blockLayout->getElementOffsetInBits(1),
3855-
tunit, tunit));
3856-
fields.push_back(createFieldType("__reserved", C.IntTy, loc, AS_public,
3857-
blockLayout->getElementOffsetInBits(2),
3858-
tunit, tunit));
3859-
auto *FnTy = block.getBlockExpr()->getFunctionType();
3860-
auto FnPtrType = CGM.getContext().getPointerType(FnTy->desugar());
3861-
fields.push_back(createFieldType("__FuncPtr", FnPtrType, loc, AS_public,
3862-
blockLayout->getElementOffsetInBits(3),
3863-
tunit, tunit));
3864-
fields.push_back(createFieldType(
3865-
"__descriptor",
3866-
C.getPointerType(block.NeedsCopyDispose
3867-
? C.getBlockDescriptorExtendedType()
3868-
: C.getBlockDescriptorType()),
3869-
loc, AS_public, blockLayout->getElementOffsetInBits(4), tunit, tunit));
3855+
if (CGM.getLangOpts().OpenCL) {
3856+
fields.push_back(createFieldType("__size", C.IntTy, loc, AS_public,
3857+
blockLayout->getElementOffsetInBits(0),
3858+
tunit, tunit));
3859+
fields.push_back(createFieldType("__align", C.IntTy, loc, AS_public,
3860+
blockLayout->getElementOffsetInBits(1),
3861+
tunit, tunit));
3862+
} else {
3863+
fields.push_back(createFieldType("__isa", C.VoidPtrTy, loc, AS_public,
3864+
blockLayout->getElementOffsetInBits(0),
3865+
tunit, tunit));
3866+
fields.push_back(createFieldType("__flags", C.IntTy, loc, AS_public,
3867+
blockLayout->getElementOffsetInBits(1),
3868+
tunit, tunit));
3869+
fields.push_back(createFieldType("__reserved", C.IntTy, loc, AS_public,
3870+
blockLayout->getElementOffsetInBits(2),
3871+
tunit, tunit));
3872+
auto *FnTy = block.getBlockExpr()->getFunctionType();
3873+
auto FnPtrType = CGM.getContext().getPointerType(FnTy->desugar());
3874+
fields.push_back(createFieldType("__FuncPtr", FnPtrType, loc, AS_public,
3875+
blockLayout->getElementOffsetInBits(3),
3876+
tunit, tunit));
3877+
fields.push_back(createFieldType(
3878+
"__descriptor",
3879+
C.getPointerType(block.NeedsCopyDispose
3880+
? C.getBlockDescriptorExtendedType()
3881+
: C.getBlockDescriptorType()),
3882+
loc, AS_public, blockLayout->getElementOffsetInBits(4), tunit, tunit));
3883+
}
38703884

38713885
// We want to sort the captures by offset, not because DWARF
38723886
// requires this, but because we're paranoid about debuggers.

Diff for: ‎clang/test/CodeGenOpenCL/blocks.cl

+10-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: %clang_cc1 %s -cl-std=CL2.0 -emit-llvm -o - -O0 -triple spir-unknown-unknown | FileCheck -check-prefixes=COMMON,SPIR %s
2-
// RUN: %clang_cc1 %s -cl-std=CL2.0 -emit-llvm -o - -O0 -triple amdgcn-amd-amdhsa | FileCheck -check-prefixes=COMMON,AMDGCN %s
1+
// RUN: %clang_cc1 %s -cl-std=CL2.0 -emit-llvm -o - -O0 -debug-info-kind=limited -triple spir-unknown-unknown | FileCheck -check-prefixes=COMMON,SPIR %s
2+
// RUN: %clang_cc1 %s -cl-std=CL2.0 -emit-llvm -o - -O0 -debug-info-kind=limited -triple amdgcn-amd-amdhsa | FileCheck -check-prefixes=COMMON,AMDGCN %s
33

44
// COMMON: @__block_literal_global = internal addrspace(1) constant { i32, i32 } { i32 8, i32 4 }
55
// COMMON-NOT: .str
@@ -60,3 +60,11 @@ void foo(){
6060
// AMDGCN: %[[block_capture:.*]] = load i32, i32* %[[block_capture_addr]]
6161

6262
// COMMON-NOT: define{{.*}}@__foo_block_invoke_kernel
63+
64+
// COMMON: !DIDerivedType(tag: DW_TAG_member, name: "__size"
65+
// COMMON: !DIDerivedType(tag: DW_TAG_member, name: "__align"
66+
67+
// COMMON-NOT: !DIDerivedType(tag: DW_TAG_member, name: "__isa"
68+
// COMMON-NOT: !DIDerivedType(tag: DW_TAG_member, name: "__flags"
69+
// COMMON-NOT: !DIDerivedType(tag: DW_TAG_member, name: "__reserved"
70+
// COMMON-NOT: !DIDerivedType(tag: DW_TAG_member, name: "__FuncPtr"

0 commit comments

Comments
 (0)
Please sign in to comment.