<div class="gmail_quote">On 27 May 2010 13:25, Devang Patel <span dir="ltr"><<a href="mailto:dpatel@apple.com">dpatel@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: dpatel<br>
Date: Thu May 27 15:25:04 2010<br>
New Revision: 104884<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=104884&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=104884&view=rev</a><br>
Log:<br>
Do not drop location info for inlined function args.<br>
<br>
Added:<br>
llvm/trunk/test/Transforms/Mem2Reg/ConvertDebugInfo2.ll<br>
Modified:<br>
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp<br>
llvm/trunk/lib/Transforms/Utils/PromoteMemoryToRegister.cpp<br>
<br>
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp?rev=104884&r1=104883&r2=104884&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp?rev=104884&r1=104883&r2=104884&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp (original)<br>
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp Thu May 27 15:25:04 2010<br>
@@ -2200,7 +2200,11 @@<br>
}<br>
<br>
DbgScope *Scope = findDbgScope(MInsn);<br>
- if (!Scope && DV.getTag() == dwarf::DW_TAG_arg_variable)<br>
+ bool CurFnArg = false;<br>
+ if (DV.getTag() == dwarf::DW_TAG_arg_variable &&<br>
+ DISubprogram(DV.getContext()).describes(MF->getFunction()))<br>
+ CurFnArg = true;<br>
+ if (!Scope && CurFnArg)<br>
Scope = CurrentFnDbgScope;<br>
// If variable scope is not found then skip this variable.<br>
if (!Scope)<br>
@@ -2209,7 +2213,7 @@<br>
Processed.insert(DV);<br>
DbgVariable *RegVar = new DbgVariable(DV);<br>
Scope->addVariable(RegVar);<br>
- if (DV.getTag() != dwarf::DW_TAG_arg_variable)<br>
+ if (!CurFnArg)<br>
DbgVariableLabelsMap[RegVar] = getLabelBeforeInsn(MInsn);<br>
if (DbgVariable *AbsVar = findAbstractVariable(DV, MInsn->getDebugLoc())) {<br>
DbgVariableToDbgInstMap[AbsVar] = MInsn;<br>
<br>
Modified: llvm/trunk/lib/Transforms/Utils/PromoteMemoryToRegister.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/PromoteMemoryToRegister.cpp?rev=104884&r1=104883&r2=104884&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/PromoteMemoryToRegister.cpp?rev=104884&r1=104883&r2=104884&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Transforms/Utils/PromoteMemoryToRegister.cpp (original)<br>
+++ llvm/trunk/lib/Transforms/Utils/PromoteMemoryToRegister.cpp Thu May 27 15:25:04 2010<br>
@@ -897,6 +897,11 @@<br>
// Propagate any debug metadata from the store onto the dbg.value.<br>
if (MDNode *SIMD = SI->getMetadata("dbg"))<br>
DbgVal->setMetadata("dbg", SIMD);<br>
+ // Otherwise propgate debug metadata from dbg.delcare for inlined fn args.<br></blockquote><div><br></div><div>Typo: dbg.delcare</div><div><br></div><div>Nick</div><div><br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
+ else if (!DISubprogram(DIVar.getContext()).<br>
+ describes(DDI->getParent()->getParent()))<br>
+ if (MDNode *MD = DDI->getMetadata("dbg"))<br>
+ DbgVal->setMetadata("dbg", MD);<br>
}<br>
<br>
// QueuePhiNode - queues a phi-node to be added to a basic-block for a specific<br>
<br>
Added: llvm/trunk/test/Transforms/Mem2Reg/ConvertDebugInfo2.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/Mem2Reg/ConvertDebugInfo2.ll?rev=104884&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/Mem2Reg/ConvertDebugInfo2.ll?rev=104884&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/Mem2Reg/ConvertDebugInfo2.ll (added)<br>
+++ llvm/trunk/test/Transforms/Mem2Reg/ConvertDebugInfo2.ll Thu May 27 15:25:04 2010<br>
@@ -0,0 +1,52 @@<br>
+; RUN: opt -mem2reg < %s | llvm-dis | grep ".dbg "| count 6<br>
+<br>
+declare void @llvm.dbg.declare(metadata, metadata) nounwind readnone<br>
+<br>
+declare void @foo(i32, i64, i8*)<br>
+<br>
+define void @baz(i32 %a) nounwind ssp {<br>
+entry:<br>
+ %x_addr.i = alloca i32 ; <i32*> [#uses=2]<br>
+ %y_addr.i = alloca i64 ; <i64*> [#uses=2]<br>
+ %z_addr.i = alloca i8* ; <i8**> [#uses=2]<br>
+ %a_addr = alloca i32 ; <i32*> [#uses=2]<br>
+ %"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]<br>
+ call void @llvm.dbg.declare(metadata !{i32* %a_addr}, metadata !0), !dbg !7<br>
+ store i32 %a, i32* %a_addr<br>
+ %0 = load i32* %a_addr, align 4, !dbg !8 ; <i32> [#uses=1]<br>
+ call void @llvm.dbg.declare(metadata !{i32* %x_addr.i}, metadata !9) nounwind, !dbg !15<br>
+ store i32 %0, i32* %x_addr.i<br>
+ call void @llvm.dbg.declare(metadata !{i64* %y_addr.i}, metadata !16) nounwind, !dbg !15<br>
+ store i64 55, i64* %y_addr.i<br>
+ call void @llvm.dbg.declare(metadata !{i8** %z_addr.i}, metadata !17) nounwind, !dbg !15<br>
+ store i8* bitcast (void (i32)* @baz to i8*), i8** %z_addr.i<br>
+ %1 = load i32* %x_addr.i, align 4, !dbg !18 ; <i32> [#uses=1]<br>
+ %2 = load i64* %y_addr.i, align 8, !dbg !18 ; <i64> [#uses=1]<br>
+ %3 = load i8** %z_addr.i, align 8, !dbg !18 ; <i8*> [#uses=1]<br>
+ call void @foo(i32 %1, i64 %2, i8* %3) nounwind, !dbg !18<br>
+ br label %return, !dbg !19<br>
+<br>
+return: ; preds = %entry<br>
+ ret void, !dbg !19<br>
+}<br>
+<br>
+!0 = metadata !{i32 524545, metadata !1, metadata !"a", metadata !2, i32 8, metadata !6} ; [ DW_TAG_arg_variable ]<br>
+!1 = metadata !{i32 524334, i32 0, metadata !2, metadata !"baz", metadata !"baz", metadata !"baz", metadata !2, i32 8, metadata !4, i1 false, i1 true, i32 0, i32 0, null, i1 false, i1 false} ; [ DW_TAG_subprogram ]<br>
+!2 = metadata !{i32 524329, metadata !"bar.c", metadata !"/tmp/", metadata !3} ; [ DW_TAG_file_type ]<br>
+!3 = metadata !{i32 524305, i32 0, i32 1, metadata !"bar.c", metadata !"/tmp/", metadata !"4.2.1 (Based on Apple Inc. build 5658) (LLVM build)", i1 true, i1 false, metadata !"", i32 0} ; [ DW_TAG_compile_unit ]<br>
+!4 = metadata !{i32 524309, metadata !2, metadata !"", metadata !2, i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !5, i32 0, null} ; [ DW_TAG_subroutine_type ]<br>
+!5 = metadata !{null, metadata !6}<br>
+!6 = metadata !{i32 524324, metadata !2, metadata !"int", metadata !2, i32 0, i64 32, i64 32, i64 0, i32 0, i32 5} ; [ DW_TAG_base_type ]<br>
+!7 = metadata !{i32 8, i32 0, metadata !1, null}<br>
+!8 = metadata !{i32 9, i32 0, metadata !1, null}<br>
+!9 = metadata !{i32 524545, metadata !10, metadata !"x", metadata !2, i32 4, metadata !6} ; [ DW_TAG_arg_variable ]<br>
+!10 = metadata !{i32 524334, i32 0, metadata !2, metadata !"bar", metadata !"bar", metadata !"bar", metadata !2, i32 4, metadata !11, i1 true, i1 true, i32 0, i32 0, null, i1 false, i1 false} ; [ DW_TAG_subprogram ]<br>
+!11 = metadata !{i32 524309, metadata !2, metadata !"", metadata !2, i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !12, i32 0, null} ; [ DW_TAG_subroutine_type ]<br>
+!12 = metadata !{null, metadata !6, metadata !13, metadata !14}<br>
+!13 = metadata !{i32 524324, metadata !2, metadata !"long int", metadata !2, i32 0, i64 64, i64 64, i64 0, i32 0, i32 5} ; [ DW_TAG_base_type ]<br>
+!14 = metadata !{i32 524303, metadata !2, metadata !"", metadata !2, i32 0, i64 64, i64 64, i64 0, i32 0, null} ; [ DW_TAG_pointer_type ]<br>
+!15 = metadata !{i32 4, i32 0, metadata !10, metadata !8}<br>
+!16 = metadata !{i32 524545, metadata !10, metadata !"y", metadata !2, i32 4, metadata !13} ; [ DW_TAG_arg_variable ]<br>
+!17 = metadata !{i32 524545, metadata !10, metadata !"z", metadata !2, i32 4, metadata !14} ; [ DW_TAG_arg_variable ]<br>
+!18 = metadata !{i32 5, i32 0, metadata !10, metadata !8}<br>
+!19 = metadata !{i32 10, i32 0, metadata !1, null}<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br>