[llvm-commits] [llvm] r104884 - in /llvm/trunk: lib/CodeGen/AsmPrinter/DwarfDebug.cpp lib/Transforms/Utils/PromoteMemoryToRegister.cpp test/Transforms/Mem2Reg/ConvertDebugInfo2.ll
Nick Lewycky
nlewycky at google.com
Thu May 27 15:28:56 PDT 2010
On 27 May 2010 13:25, Devang Patel <dpatel at apple.com> wrote:
> Author: dpatel
> Date: Thu May 27 15:25:04 2010
> New Revision: 104884
>
> URL: http://llvm.org/viewvc/llvm-project?rev=104884&view=rev
> Log:
> Do not drop location info for inlined function args.
>
> Added:
> llvm/trunk/test/Transforms/Mem2Reg/ConvertDebugInfo2.ll
> Modified:
> llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
> llvm/trunk/lib/Transforms/Utils/PromoteMemoryToRegister.cpp
>
> Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp?rev=104884&r1=104883&r2=104884&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp (original)
> +++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp Thu May 27 15:25:04
> 2010
> @@ -2200,7 +2200,11 @@
> }
>
> DbgScope *Scope = findDbgScope(MInsn);
> - if (!Scope && DV.getTag() == dwarf::DW_TAG_arg_variable)
> + bool CurFnArg = false;
> + if (DV.getTag() == dwarf::DW_TAG_arg_variable &&
> + DISubprogram(DV.getContext()).describes(MF->getFunction()))
> + CurFnArg = true;
> + if (!Scope && CurFnArg)
> Scope = CurrentFnDbgScope;
> // If variable scope is not found then skip this variable.
> if (!Scope)
> @@ -2209,7 +2213,7 @@
> Processed.insert(DV);
> DbgVariable *RegVar = new DbgVariable(DV);
> Scope->addVariable(RegVar);
> - if (DV.getTag() != dwarf::DW_TAG_arg_variable)
> + if (!CurFnArg)
> DbgVariableLabelsMap[RegVar] = getLabelBeforeInsn(MInsn);
> if (DbgVariable *AbsVar = findAbstractVariable(DV,
> MInsn->getDebugLoc())) {
> DbgVariableToDbgInstMap[AbsVar] = MInsn;
>
> Modified: llvm/trunk/lib/Transforms/Utils/PromoteMemoryToRegister.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/PromoteMemoryToRegister.cpp?rev=104884&r1=104883&r2=104884&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Transforms/Utils/PromoteMemoryToRegister.cpp (original)
> +++ llvm/trunk/lib/Transforms/Utils/PromoteMemoryToRegister.cpp Thu May 27
> 15:25:04 2010
> @@ -897,6 +897,11 @@
> // Propagate any debug metadata from the store onto the dbg.value.
> if (MDNode *SIMD = SI->getMetadata("dbg"))
> DbgVal->setMetadata("dbg", SIMD);
> + // Otherwise propgate debug metadata from dbg.delcare for inlined fn
> args.
>
Typo: dbg.delcare
Nick
+ else if (!DISubprogram(DIVar.getContext()).
> + describes(DDI->getParent()->getParent()))
> + if (MDNode *MD = DDI->getMetadata("dbg"))
> + DbgVal->setMetadata("dbg", MD);
> }
>
> // QueuePhiNode - queues a phi-node to be added to a basic-block for a
> specific
>
> Added: llvm/trunk/test/Transforms/Mem2Reg/ConvertDebugInfo2.ll
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/Mem2Reg/ConvertDebugInfo2.ll?rev=104884&view=auto
>
> ==============================================================================
> --- llvm/trunk/test/Transforms/Mem2Reg/ConvertDebugInfo2.ll (added)
> +++ llvm/trunk/test/Transforms/Mem2Reg/ConvertDebugInfo2.ll Thu May 27
> 15:25:04 2010
> @@ -0,0 +1,52 @@
> +; RUN: opt -mem2reg < %s | llvm-dis | grep ".dbg "| count 6
> +
> +declare void @llvm.dbg.declare(metadata, metadata) nounwind readnone
> +
> +declare void @foo(i32, i64, i8*)
> +
> +define void @baz(i32 %a) nounwind ssp {
> +entry:
> + %x_addr.i = alloca i32 ; <i32*> [#uses=2]
> + %y_addr.i = alloca i64 ; <i64*> [#uses=2]
> + %z_addr.i = alloca i8* ; <i8**> [#uses=2]
> + %a_addr = alloca i32 ; <i32*> [#uses=2]
> + %"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
> + call void @llvm.dbg.declare(metadata !{i32* %a_addr}, metadata !0), !dbg
> !7
> + store i32 %a, i32* %a_addr
> + %0 = load i32* %a_addr, align 4, !dbg !8 ; <i32> [#uses=1]
> + call void @llvm.dbg.declare(metadata !{i32* %x_addr.i}, metadata !9)
> nounwind, !dbg !15
> + store i32 %0, i32* %x_addr.i
> + call void @llvm.dbg.declare(metadata !{i64* %y_addr.i}, metadata !16)
> nounwind, !dbg !15
> + store i64 55, i64* %y_addr.i
> + call void @llvm.dbg.declare(metadata !{i8** %z_addr.i}, metadata !17)
> nounwind, !dbg !15
> + store i8* bitcast (void (i32)* @baz to i8*), i8** %z_addr.i
> + %1 = load i32* %x_addr.i, align 4, !dbg !18 ; <i32> [#uses=1]
> + %2 = load i64* %y_addr.i, align 8, !dbg !18 ; <i64> [#uses=1]
> + %3 = load i8** %z_addr.i, align 8, !dbg !18 ; <i8*> [#uses=1]
> + call void @foo(i32 %1, i64 %2, i8* %3) nounwind, !dbg !18
> + br label %return, !dbg !19
> +
> +return: ; preds = %entry
> + ret void, !dbg !19
> +}
> +
> +!0 = metadata !{i32 524545, metadata !1, metadata !"a", metadata !2, i32
> 8, metadata !6} ; [ DW_TAG_arg_variable ]
> +!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 ]
> +!2 = metadata !{i32 524329, metadata !"bar.c", metadata !"/tmp/", metadata
> !3} ; [ DW_TAG_file_type ]
> +!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 ]
> +!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 ]
> +!5 = metadata !{null, metadata !6}
> +!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 ]
> +!7 = metadata !{i32 8, i32 0, metadata !1, null}
> +!8 = metadata !{i32 9, i32 0, metadata !1, null}
> +!9 = metadata !{i32 524545, metadata !10, metadata !"x", metadata !2, i32
> 4, metadata !6} ; [ DW_TAG_arg_variable ]
> +!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 ]
> +!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 ]
> +!12 = metadata !{null, metadata !6, metadata !13, metadata !14}
> +!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 ]
> +!14 = metadata !{i32 524303, metadata !2, metadata !"", metadata !2, i32
> 0, i64 64, i64 64, i64 0, i32 0, null} ; [ DW_TAG_pointer_type ]
> +!15 = metadata !{i32 4, i32 0, metadata !10, metadata !8}
> +!16 = metadata !{i32 524545, metadata !10, metadata !"y", metadata !2, i32
> 4, metadata !13} ; [ DW_TAG_arg_variable ]
> +!17 = metadata !{i32 524545, metadata !10, metadata !"z", metadata !2, i32
> 4, metadata !14} ; [ DW_TAG_arg_variable ]
> +!18 = metadata !{i32 5, i32 0, metadata !10, metadata !8}
> +!19 = metadata !{i32 10, i32 0, metadata !1, null}
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20100527/880ba117/attachment.html>
More information about the llvm-commits
mailing list