From 616bef4ad164a0ddde9d26533514f5ab305915da Mon Sep 17 00:00:00 2001 From: Adrian Prantl Date: Thu, 14 Mar 2013 21:52:59 +0000 Subject: [PATCH] Always declare the .block_descriptor parameter, not just the local copy. Un-breaks gdb's invoke-block behavior. llvm-svn: 177118 --- clang/lib/CodeGen/CGDebugInfo.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp index 6b0edbcafe68..ae88732c8215 100644 --- a/clang/lib/CodeGen/CGDebugInfo.cpp +++ b/clang/lib/CodeGen/CGDebugInfo.cpp @@ -2817,17 +2817,18 @@ void CGDebugInfo::EmitDeclareOfBlockLiteralArgVariable(const CGBlockInfo &block, CGM.getLangOpts().Optimize, flags, cast(Arg)->getArgNo() + 1); - // Matching the code in EmitParmDecl, depending on optimization level. - llvm::Instruction *Call; - if (LocalAddr) + if (LocalAddr) { // Insert an llvm.dbg.value into the current block. - Call = DBuilder.insertDbgValueIntrinsic(LocalAddr, 0, debugVar, - Builder.GetInsertBlock()); - else - // Insert an llvm.dbg.declare into the current block. - Call = DBuilder.insertDeclare(Arg, debugVar, Builder.GetInsertBlock()); + llvm::Instruction *DbgVal = + DBuilder.insertDbgValueIntrinsic(LocalAddr, 0, debugVar, + Builder.GetInsertBlock()); + DbgVal->setDebugLoc(llvm::DebugLoc::get(line, column, scope)); + } - Call->setDebugLoc(llvm::DebugLoc::get(line, column, scope)); + // Insert an llvm.dbg.declare into the current block. + llvm::Instruction *DbgDecl = + DBuilder.insertDeclare(Arg, debugVar, Builder.GetInsertBlock()); + DbgDecl->setDebugLoc(llvm::DebugLoc::get(line, column, scope)); } /// getStaticDataMemberDeclaration - If D is an out-of-class definition of