From 639ed1da2f19d52e75fda5011c548223095d0b68 Mon Sep 17 00:00:00 2001 From: Adrian Prantl Date: Thu, 26 Oct 2017 18:32:16 +0000 Subject: [PATCH] Revert "Simplify codegen and debug info generation for block context parameters." This reverts commit r316684 while investigating buildbot breakage. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@316686 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CGBlocks.cpp | 16 ++--- lib/CodeGen/CGDebugInfo.cpp | 16 +++-- lib/CodeGen/CGDebugInfo.h | 4 +- test/CodeGen/debug-info-block-vars.c | 20 ------ .../debug-info-block-captured-self.m | 72 +++++++++++++++++++ 5 files changed, 94 insertions(+), 34 deletions(-) delete mode 100644 test/CodeGen/debug-info-block-vars.c create mode 100644 test/CodeGenObjC/debug-info-block-captured-self.m diff --git a/lib/CodeGen/CGBlocks.cpp b/lib/CodeGen/CGBlocks.cpp index e7743fa0c6..2915dabe54 100644 --- a/lib/CodeGen/CGBlocks.cpp +++ b/lib/CodeGen/CGBlocks.cpp @@ -1294,19 +1294,19 @@ void CodeGenFunction::setBlockContextParameter(const ImplicitParamDecl *D, assert(BlockInfo && "not emitting prologue of block invocation function?!"); llvm::Value *localAddr = nullptr; - // Allocate a stack slot like for any local variable to guarantee optimal - // debug info at -O0. The mem2reg pass will eliminate it when optimizing. - Address alloc = CreateMemTemp(D->getType(), D->getName() + ".addr"); - Builder.CreateStore(arg, alloc); - localAddr = Builder.CreateLoad(alloc); + if (CGM.getCodeGenOpts().OptimizationLevel == 0) { + // Allocate a stack slot to let the debug info survive the RA. + Address alloc = CreateMemTemp(D->getType(), D->getName() + ".addr"); + Builder.CreateStore(arg, alloc); + localAddr = Builder.CreateLoad(alloc); + } if (CGDebugInfo *DI = getDebugInfo()) { if (CGM.getCodeGenOpts().getDebugInfo() >= codegenoptions::LimitedDebugInfo) { DI->setLocation(D->getLocation()); - DI->EmitDeclareOfBlockLiteralArgVariable( - *BlockInfo, D->getName(), argNum, - cast(alloc.getPointer()), Builder); + DI->EmitDeclareOfBlockLiteralArgVariable(*BlockInfo, arg, argNum, + localAddr, Builder); } } diff --git a/lib/CodeGen/CGDebugInfo.cpp b/lib/CodeGen/CGDebugInfo.cpp index 3e4acd208f..a73e4a98b3 100644 --- a/lib/CodeGen/CGDebugInfo.cpp +++ b/lib/CodeGen/CGDebugInfo.cpp @@ -3694,9 +3694,9 @@ bool operator<(const BlockLayoutChunk &l, const BlockLayoutChunk &r) { } void CGDebugInfo::EmitDeclareOfBlockLiteralArgVariable(const CGBlockInfo &block, - StringRef Name, + llvm::Value *Arg, unsigned ArgNo, - llvm::AllocaInst *Alloca, + llvm::Value *LocalAddr, CGBuilderTy &Builder) { assert(DebugKind >= codegenoptions::LimitedDebugInfo); ASTContext &C = CGM.getContext(); @@ -3828,11 +3828,19 @@ void CGDebugInfo::EmitDeclareOfBlockLiteralArgVariable(const CGBlockInfo &block, // Create the descriptor for the parameter. auto *debugVar = DBuilder.createParameterVariable( - scope, Name, ArgNo, tunit, line, type, + scope, Arg->getName(), ArgNo, tunit, line, type, CGM.getLangOpts().Optimize, flags); + if (LocalAddr) { + // Insert an llvm.dbg.value into the current block. + DBuilder.insertDbgValueIntrinsic( + LocalAddr, debugVar, DBuilder.createExpression(), + llvm::DebugLoc::get(line, column, scope, CurInlinedAt), + Builder.GetInsertBlock()); + } + // Insert an llvm.dbg.declare into the current block. - DBuilder.insertDeclare(Alloca, debugVar, DBuilder.createExpression(), + DBuilder.insertDeclare(Arg, debugVar, DBuilder.createExpression(), llvm::DebugLoc::get(line, column, scope, CurInlinedAt), Builder.GetInsertBlock()); } diff --git a/lib/CodeGen/CGDebugInfo.h b/lib/CodeGen/CGDebugInfo.h index 4f7b7f2a0d..36de231f05 100644 --- a/lib/CodeGen/CGDebugInfo.h +++ b/lib/CodeGen/CGDebugInfo.h @@ -398,8 +398,8 @@ public: /// Emit call to \c llvm.dbg.declare for the block-literal argument /// to a block invocation function. void EmitDeclareOfBlockLiteralArgVariable(const CGBlockInfo &block, - StringRef Name, unsigned ArgNo, - llvm::AllocaInst *LocalAddr, + llvm::Value *Arg, unsigned ArgNo, + llvm::Value *LocalAddr, CGBuilderTy &Builder); /// Emit information about a global variable. diff --git a/test/CodeGen/debug-info-block-vars.c b/test/CodeGen/debug-info-block-vars.c deleted file mode 100644 index e0bb61e5e8..0000000000 --- a/test/CodeGen/debug-info-block-vars.c +++ /dev/null @@ -1,20 +0,0 @@ -// RUN: %clang_cc1 -x c -fblocks -debug-info-kind=standalone -emit-llvm -O0 \ -// RUN: -triple x86_64-apple-darwin -o - %s | FileCheck %s -// RUN: %clang_cc1 -x c -fblocks -debug-info-kind=standalone -emit-llvm -O1 \ -// RUN: -triple x86_64-apple-darwin -o - %s \ -// RUN: | FileCheck --check-prefix=CHECK-OPT %s - -// CHECK: define internal void @__f_block_invoke(i8* %.block_descriptor) -// CHECK: %.block_descriptor.addr = alloca i8*, align 8 -// CHECK: %block.addr = alloca <{ i8*, i32, i32, i8*, %struct.__block_descriptor* }>*, align 8 -// CHECK: store i8* %.block_descriptor, i8** %.block_descriptor.addr, align 8 -// CHECK: call void @llvm.dbg.declare(metadata i8** %.block_descriptor.addr, -// CHECK-SAME: metadata !DIExpression()) -// CHECK-OPT-NOT: alloca -// CHECK-OPT: call void @llvm.dbg.value(metadata i8* %.block_descriptor, -// CHECK-OPT-SAME: metadata !DIExpression()) -void f() { - a(^{ - b(); - }); -} diff --git a/test/CodeGenObjC/debug-info-block-captured-self.m b/test/CodeGenObjC/debug-info-block-captured-self.m new file mode 100644 index 0000000000..302a011342 --- /dev/null +++ b/test/CodeGenObjC/debug-info-block-captured-self.m @@ -0,0 +1,72 @@ +// RUN: %clang_cc1 -fblocks -debug-info-kind=limited -emit-llvm -triple x86_64-apple-darwin -o - %s | FileCheck %s +// +// Test that debug location is generated for a captured "self" inside +// a block. +// +// This test is split into two parts, this one for the frontend, and +// then llvm/test/DebugInfo/debug-info-block-captured-self.ll to +// ensure that DW_AT_location is generated for the captured self. +@class T; +@interface S +@end +@interface Mode +-(int) count; +@end +@interface Context +@end +@interface ViewController +@property (nonatomic, readwrite, strong) Context *context; +@end +typedef enum { + Unknown = 0, +} State; +@interface Main : ViewController +{ + T * t1; + T * t2; +} +@property(readwrite, nonatomic) State state; +@end +@implementation Main +- (id) initWithContext:(Context *) context +{ + t1 = [self.context withBlock:^(id obj){ + id *mode1; + t2 = [mode1 withBlock:^(id object){ + Mode *mode2 = object; + if ([mode2 count] != 0) { + self.state = 0; + } + }]; + }]; +} +@end +// The important part of this test is that there is a dbg.value +// intrinsic associated with the implicit .block_descriptor argument +// of the block. We also test that this value gets alloca'd, so the +// register llocator won't accidentally kill it. + +// outer block: +// CHECK: define internal void {{.*}}_block_invoke{{.*}} + +// inner block: +// CHECK: define internal void {{.*}}_block_invoke{{.*}} +// CHECK: %[[MEM1:.*]] = alloca i8*, align 8 +// CHECK-NEXT: %[[MEM2:.*]] = alloca i8*, align 8 +// CHECK-NEXT: [[DBGADDR:%.*]] = alloca [[BLOCK_T:<{.*}>]]*, align 8 +// CHECK: store i8* [[BLOCK_DESC:%.*]], i8** %[[MEM1]], align 8 +// CHECK: %[[TMP0:.*]] = load i8*, i8** %[[MEM1]] +// CHECK: call void @llvm.dbg.value(metadata i8* %[[TMP0]], metadata ![[BDMD:[0-9]+]], metadata !{{.*}}) +// CHECK: call void @llvm.dbg.declare(metadata i8* [[BLOCK_DESC]], metadata ![[BDMD:[0-9]+]], metadata !{{.*}}) +// CHECK: store [[BLOCK_T]]* {{%.*}}, [[BLOCK_T]]** [[DBGADDR]], align 8 +// CHECK: call void @llvm.dbg.declare(metadata [[BLOCK_T]]** [[DBGADDR]], metadata ![[SELF:.*]], metadata !{{.*}}) +// make sure we are still in the same function +// CHECK: define {{.*}}__copy_helper_block_ +// Metadata +// CHECK: ![[MAIN:.*]] = !DICompositeType(tag: DW_TAG_structure_type, name: "Main" +// CHECK-SAME: line: 23, +// CHECK: ![[PMAIN:.*]] = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: ![[MAIN]], +// CHECK: ![[BDMD]] = !DILocalVariable(name: ".block_descriptor", arg: +// CHECK: ![[SELF]] = !DILocalVariable(name: "self" +// CHECK-NOT: arg: +// CHECK-SAME: line: 40, -- 2.40.0