<div dir="ltr">Testcase? :)<div><br></div><div style>-eric</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Mar 14, 2013 at 2:52 PM, Adrian Prantl <span dir="ltr"><<a href="mailto:aprantl@apple.com" target="_blank">aprantl@apple.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: adrian<br>
Date: Thu Mar 14 16:52:59 2013<br>
New Revision: 177118<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=177118&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=177118&view=rev</a><br>
Log:<br>
Always declare the .block_descriptor parameter, not just the local copy.<br>
Un-breaks gdb's invoke-block behavior.<br>
<br>
Modified:<br>
    cfe/trunk/lib/CodeGen/CGDebugInfo.cpp<br>
<br>
Modified: cfe/trunk/lib/CodeGen/CGDebugInfo.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.cpp?rev=177118&r1=177117&r2=177118&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.cpp?rev=177118&r1=177117&r2=177118&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/lib/CodeGen/CGDebugInfo.cpp (original)<br>
+++ cfe/trunk/lib/CodeGen/CGDebugInfo.cpp Thu Mar 14 16:52:59 2013<br>
@@ -2817,17 +2817,18 @@ void CGDebugInfo::EmitDeclareOfBlockLite<br>
                                  CGM.getLangOpts().Optimize, flags,<br>
                                  cast<llvm::Argument>(Arg)->getArgNo() + 1);<br>
<br>
-  // Matching the code in EmitParmDecl, depending on optimization level.<br>
-  llvm::Instruction *Call;<br>
-  if (LocalAddr)<br>
+  if (LocalAddr) {<br>
     // Insert an llvm.dbg.value into the current block.<br>
-    Call = DBuilder.insertDbgValueIntrinsic(LocalAddr, 0, debugVar,<br>
-                                            Builder.GetInsertBlock());<br>
-  else<br>
-    // Insert an llvm.dbg.declare into the current block.<br>
-    Call = DBuilder.insertDeclare(Arg, debugVar, Builder.GetInsertBlock());<br>
+    llvm::Instruction *DbgVal =<br>
+      DBuilder.insertDbgValueIntrinsic(LocalAddr, 0, debugVar,<br>
+                                      Builder.GetInsertBlock());<br>
+    DbgVal->setDebugLoc(llvm::DebugLoc::get(line, column, scope));<br>
+  }<br>
<br>
-  Call->setDebugLoc(llvm::DebugLoc::get(line, column, scope));<br>
+  // Insert an llvm.dbg.declare into the current block.<br>
+  llvm::Instruction *DbgDecl =<br>
+    DBuilder.insertDeclare(Arg, debugVar, Builder.GetInsertBlock());<br>
+  DbgDecl->setDebugLoc(llvm::DebugLoc::get(line, column, scope));<br>
 }<br>
<br>
 /// getStaticDataMemberDeclaration - If D is an out-of-class definition of<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>