Index: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp =================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp @@ -5102,6 +5102,13 @@ return nullptr; } + // Static allocas are handled more efficiently in the variable frame index + // side table. + const auto *AI = + dyn_cast(Address->stripInBoundsConstantOffsets()); + if (AI && AI->isStaticAlloca() && FuncInfo.StaticAllocaMap.count(AI)) + return nullptr; + // Byval arguments with frame indices were already handled after argument // lowering and before isel. const auto *Arg = Index: llvm/trunk/test/DebugInfo/COFF/local-variables.ll =================================================================== --- llvm/trunk/test/DebugInfo/COFF/local-variables.ll +++ llvm/trunk/test/DebugInfo/COFF/local-variables.ll @@ -33,8 +33,8 @@ ; ASM: .cv_loc 0 1 8 7 # t.cpp:8:7 ; ASM: testl %ecx, %ecx ; ASM: je .LBB0_2 -; ASM: [[if_start:\.Ltmp.*]]: ; ASM: # BB#1: # %if.then +; ASM: [[if_start:\.Ltmp.*]]: ; ASM: .cv_loc 0 1 9 9 # t.cpp:9:9 ; ASM: movl $42, 40(%rsp) ; ASM: [[inline_site1:\.Ltmp.*]]: Index: llvm/trunk/test/DebugInfo/WebAssembly/dbg-declare.ll =================================================================== --- llvm/trunk/test/DebugInfo/WebAssembly/dbg-declare.ll +++ llvm/trunk/test/DebugInfo/WebAssembly/dbg-declare.ll @@ -1,7 +1,6 @@ ; RUN: llc < %s -verify-machineinstrs -mtriple=wasm32-unknown-unknown-wasm | FileCheck %s ; RUN: llc < %s -verify-machineinstrs -mtriple=wasm32-unknown-unknown-wasm -fast-isel | FileCheck --check-prefix=CHECK-FAST %s -; CHECK: #DEBUG_VALUE: decode:i <- [%vreg -; CHECK: #DEBUG_VALUE: decode:v <- [%vreg + ; CHECK: DW_TAG_variable ; CHECK-FAST: DW_TAG_variable Index: llvm/trunk/test/DebugInfo/X86/array.ll =================================================================== --- llvm/trunk/test/DebugInfo/X86/array.ll +++ llvm/trunk/test/DebugInfo/X86/array.ll @@ -13,14 +13,18 @@ ; } ; ; RUN: llc -filetype=asm %s -o - | FileCheck %s -; Test that we only emit register-indirect locations for the array array. -; rdar://problem/14874886 -; -; CHECK-NOT: ##DEBUG_VALUE: main:array <- %R{{.*}} +; RUN: llc -filetype=obj %s -o - | llvm-dwarfdump - --debug-dump=info | FileCheck %s --check-prefix=DWARF + +; CHECK-LABEL: _main: +; CHECK: movaps {{.*}}, (%rsp) ; CHECK: movq %rsp, %rdi -; CHECK-NOT: ##DEBUG_VALUE: main:array <- %R{{.*}} -; CHECK: ##DEBUG_VALUE: main:array <- [%RDI+0] -; CHECK-NOT: ##DEBUG_VALUE: main:array <- %R{{.*}} +; CHECK: callq _f + +; DWARF: DW_TAG_variable +; "<0x2> 91 00" means fbreg 0, i.e. offset RSP+0. +; DWARF-NEXT: DW_AT_location [DW_FORM_exprloc] (<0x2> 91 00 ) +; DWARF-NEXT: DW_AT_name [DW_FORM_strp] ( {{.*}} = "array") + ; ModuleID = '/tmp/array.c' source_filename = "/tmp/array.c" target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" Index: llvm/trunk/test/DebugInfo/X86/dbg-declare-alloca.ll =================================================================== --- llvm/trunk/test/DebugInfo/X86/dbg-declare-alloca.ll +++ llvm/trunk/test/DebugInfo/X86/dbg-declare-alloca.ll @@ -0,0 +1,63 @@ +; RUN: llc < %s | FileCheck %s +; RUN: llc < %s -filetype=obj | llvm-dwarfdump - -debug-dump=info | FileCheck %s --check-prefix=DWARF + +; This should use the frame index side table for allocas, not DBG_VALUE +; instructions. For SDAG ISel, this test would see an SDNode materializing the +; argument to escape_foo and we'd get DBG_VALUE MachineInstr. + +; CHECK-LABEL: use_dbg_declare: +; CHECK-NOT: #DEBUG_VALUE + +; "<0x2> 91 00" means "fbreg uleb(0)", i.e. RSP+0. +; DWARF: DW_TAG_variable +; DWARF-NEXT: DW_AT_location [DW_FORM_exprloc] (<0x2> 91 00 ) +; DWARF-NEXT: DW_AT_name [DW_FORM_strp] ( {{.*}} = "o") + + +; ModuleID = 't.c' +source_filename = "t.c" +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" +target triple = "x86_64--linux" + +%struct.Foo = type { i32 } + +; Function Attrs: noinline nounwind uwtable +define void @use_dbg_declare() #0 !dbg !7 { +entry: + %o = alloca %struct.Foo, align 4 + call void @llvm.dbg.declare(metadata %struct.Foo* %o, metadata !10, metadata !15), !dbg !16 + call void @escape_foo(%struct.Foo* %o), !dbg !17 + ret void, !dbg !18 +} + +; Function Attrs: nounwind readnone speculatable +declare void @llvm.dbg.declare(metadata, metadata, metadata) #1 + +declare void @escape_foo(%struct.Foo*) + +attributes #0 = { noinline nounwind uwtable } +attributes #1 = { nounwind readnone speculatable } + +!llvm.dbg.cu = !{!0} +!llvm.module.flags = !{!3, !4, !5} +!llvm.ident = !{!6} + +!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 6.0.0 ", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !2) +!1 = !DIFile(filename: "t.c", directory: "C:\5Csrc\5Cllvm-project\5Cbuild") +!2 = !{} +!3 = !{i32 2, !"Dwarf Version", i32 4} +!4 = !{i32 2, !"Debug Info Version", i32 3} +!5 = !{i32 1, !"wchar_size", i32 4} +!6 = !{!"clang version 6.0.0 "} +!7 = distinct !DISubprogram(name: "use_dbg_declare", scope: !1, file: !1, line: 3, type: !8, isLocal: false, isDefinition: true, scopeLine: 3, flags: DIFlagPrototyped, isOptimized: false, unit: !0, variables: !2) +!8 = !DISubroutineType(types: !9) +!9 = !{null} +!10 = !DILocalVariable(name: "o", scope: !7, file: !1, line: 4, type: !11) +!11 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "Foo", file: !1, line: 1, size: 32, elements: !12) +!12 = !{!13} +!13 = !DIDerivedType(tag: DW_TAG_member, name: "x", scope: !11, file: !1, line: 1, baseType: !14, size: 32) +!14 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed) +!15 = !DIExpression() +!16 = !DILocation(line: 4, column: 14, scope: !7) +!17 = !DILocation(line: 5, column: 3, scope: !7) +!18 = !DILocation(line: 6, column: 1, scope: !7) Index: llvm/trunk/test/DebugInfo/X86/dbg-declare.ll =================================================================== --- llvm/trunk/test/DebugInfo/X86/dbg-declare.ll +++ llvm/trunk/test/DebugInfo/X86/dbg-declare.ll @@ -1,6 +1,18 @@ -; RUN: llc < %s -O0 -mtriple x86_64-apple-darwin +; RUN: llc < %s -O0 -mtriple x86_64-apple-darwin | FileCheck %s +; RUN: llc < %s -O0 -mtriple x86_64-apple-darwin -filetype=obj \ +; RUN: | llvm-dwarfdump - -debug-dump=info | FileCheck %s --check-prefix=DWARF ; +; CHECK-LABEL: _foo: +; CHECK-NOT: #DEBUG_VALUE + +; "[DW_FORM_exprloc] <0x2> 91 XX" means fbreg uleb(XX) +; DWARF-LABEL: DW_TAG_formal_parameter +; DWARF-NEXT: DW_AT_location [DW_FORM_exprloc] (<0x2> 91 70 ) +; DWARF-NEXT: DW_AT_name [DW_FORM_strp] ( {{.*}} = "x") + +; FIXME: There is no debug info to describe "a". + define i32 @foo(i32* %x) nounwind uwtable ssp !dbg !5 { entry: %x.addr = alloca i32*, align 8