[llvm-commits] [llvm] r94480 - in /llvm/trunk: lib/CodeGen/SelectionDAG/FastISel.cpp lib/Target/X86/X86FastISel.cpp test/DebugInfo/2010-01-18-DbgValue.ll

[Dale Johannesen]

On Jan 26, 2010, at 5:58 PMPST, Chris Lattner wrote:
> On Jan 25, 2010, at 4:09 PM, Dale Johannesen wrote:
>
>> Author: johannes
>> Date: Mon Jan 25 18:09:58 2010
>> New Revision: 94480
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=94480&view=rev
>> Log:
>> Generate DEBUG_VALUE comments on x86.  The (limited)
>> dbg.declare's we currently generate go through both
>> register allocators without perturbing the results.
>
> Hi Dale,
>
>> +++ llvm/trunk/lib/Target/X86/X86FastISel.cpp Mon Jan 25 18:09:58  
>> 2010
>> @@ -1153,6 +1153,16 @@
>>  // FIXME: Handle more intrinsics.
>>  switch (I.getIntrinsicID()) {
>>  default: return false;
>> +  case Intrinsic::dbg_declare: {
>> +    DbgDeclareInst *DI = cast<DbgDeclareInst>(&I);
>> +    X86AddressMode AM;
>> +    if (!X86SelectAddress(DI->getAddress(), AM))
>
> DI->getAddress() can return null here, I think the dbg.declare  
> should silently be dropped in that case.

No it can't, we detected the null case earlier (in FastISel) and never  
reached here.

> -Chris
>
>> +      return false;
>> +    const TargetInstrDesc &II =  
>> TII.get(TargetInstrInfo::DEBUG_VALUE);
>> +    addFullAddress(BuildMI(MBB, DL, II), AM).addImm(0).
>> +                                        addMetadata(DI- 
>> >getVariable());
>> +    return true;
>> +  }
>>  case Intrinsic::trap: {
>>    BuildMI(MBB, DL, TII.get(X86::TRAP));
>>    return true;
>>
>> Added: llvm/trunk/test/DebugInfo/2010-01-18-DbgValue.ll
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/2010-01-18-DbgValue.ll?rev=94480&view=auto
>>
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> =====================================================================
>> --- llvm/trunk/test/DebugInfo/2010-01-18-DbgValue.ll (added)
>> +++ llvm/trunk/test/DebugInfo/2010-01-18-DbgValue.ll Mon Jan 25  
>> 18:09:58 2010
>> @@ -0,0 +1,55 @@
>> +; RUN: llc -O0 < %s | FileCheck %s
>> +; ModuleID = 'try.c'
>> +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16- 
>> i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128- 
>> a0:0:64-f80:128:128-n8:16:32"
>> +target triple = "i386-apple-darwin9.8"
>> +; Currently, dbg.declare generates a DEBUG_VALUE comment.   
>> Eventually it will
>> +; generate DWARF and this test will need to be modified or removed.
>> +
>> + at Y = common global i32 0                          ; <i32*> [#uses=1]
>> +
>> +define i32 @test() nounwind {
>> +entry:
>> +; CHECK: DEBUG_VALUE:
>> +  %retval = alloca i32                            ; <i32*> [#uses=2]
>> +  %X = alloca i32                                 ; <i32*> [#uses=5]
>> +  %0 = alloca i32                                 ; <i32*> [#uses=2]
>> +  %"alloca point" = bitcast i32 0 to i32          ; <i32> [#uses=0]
>> +  call void @llvm.dbg.declare(metadata !{i32* %X}, metadata !3), ! 
>> dbg !7
>> +  store i32 4, i32* %X, align 4, !dbg !8
>> +  %1 = load i32* %X, align 4, !dbg !9             ; <i32> [#uses=1]
>> +  call void @use(i32 %1) nounwind, !dbg !9
>> +  %2 = load i32* @Y, align 4, !dbg !10            ; <i32> [#uses=1]
>> +  %3 = add nsw i32 %2, 2, !dbg !10                ; <i32> [#uses=1]
>> +  store i32 %3, i32* %X, align 4, !dbg !10
>> +  %4 = load i32* %X, align 4, !dbg !11            ; <i32> [#uses=1]
>> +  call void @use(i32 %4) nounwind, !dbg !11
>> +  %5 = load i32* %X, align 4, !dbg !12            ; <i32> [#uses=1]
>> +  store i32 %5, i32* %0, align 4, !dbg !12
>> +  %6 = load i32* %0, align 4, !dbg !12            ; <i32> [#uses=1]
>> +  store i32 %6, i32* %retval, align 4, !dbg !12
>> +  br label %return, !dbg !12
>> +
>> +return:                                           ; preds = %entry
>> +  %retval1 = load i32* %retval, !dbg !12          ; <i32> [#uses=1]
>> +  ret i32 %retval1, !dbg !12
>> +}
>> +
>> +declare void @llvm.dbg.declare(metadata, metadata) nounwind readnone
>> +
>> +declare void @use(i32)
>> +
>> +!llvm.dbg.gv = !{!0}
>> +
>> +!0 = metadata !{i32 458804, i32 0, metadata !1, metadata !"Y",  
>> metadata !"Y", metadata !"Y", metadata !1, i32 2, metadata !2, i1  
>> false, i1 true, i32* @Y} ; [ DW_TAG_variable ]
>> +!1 = metadata !{i32 458769, i32 0, i32 1, metadata !"try.c",  
>> metadata !"/Volumes/MacOS9/tests/", metadata !"4.2.1 (Based on  
>> Apple Inc. build 5658) (LLVM build)", i1 true, i1 false,  
>> metadata !"", i32 0} ; [ DW_TAG_compile_unit ]
>> +!2 = metadata !{i32 458788, metadata !1, metadata !"int",  
>> metadata !1, i32 0, i64 32, i64 32, i64 0, i32 0, i32 5} ;  
>> [ DW_TAG_base_type ]
>> +!3 = metadata !{i32 459008, metadata !4, metadata !"X", metadata ! 
>> 1, i32 4, metadata !2} ; [ DW_TAG_auto_variable ]
>> +!4 = metadata !{i32 458798, i32 0, metadata !1, metadata !"",  
>> metadata !"", metadata !"test", metadata !1, i32 3, metadata !5, i1  
>> false, i1 true, i32 0, i32 0, null} ; [ DW_TAG_subprogram ]
>> +!5 = metadata !{i32 458773, metadata !1, metadata !"", metadata ! 
>> 1, i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !6, i32 0} ;  
>> [ DW_TAG_subroutine_type ]
>> +!6 = metadata !{metadata !2}
>> +!7 = metadata !{i32 3, i32 0, metadata !4, null}
>> +!8 = metadata !{i32 4, i32 0, metadata !4, null}
>> +!9 = metadata !{i32 5, i32 0, metadata !4, null}
>> +!10 = metadata !{i32 6, i32 0, metadata !4, null}
>> +!11 = metadata !{i32 7, i32 0, metadata !4, null}
>> +!12 = metadata !{i32 8, i32 0, metadata !4, null}
>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>