Index: lib/Target/X86/X86FrameLowering.cpp =================================================================== --- lib/Target/X86/X86FrameLowering.cpp +++ lib/Target/X86/X86FrameLowering.cpp @@ -2870,6 +2870,8 @@ // Count the number of uses for each object. for (auto &MBB : MF) { for (auto &MI : MBB) { + if (MI.isDebugValue()) + continue; for (const MachineOperand &MO : MI.operands()) { // Check to see if it's a local stack symbol. if (!MO.isFI()) Index: test/CodeGen/X86/frame-order.ll =================================================================== --- /dev/null +++ test/CodeGen/X86/frame-order.ll @@ -0,0 +1,122 @@ +; RUN: llc -march=x86 -disable-debug-info-print < %s | FileCheck %s +; RUN: opt -strip -S < %s | llc -march=x86 -disable-debug-info-print | FileCheck %s + +; This test checks if the code is generated correctly with and without debug info. + +; This LL file was generated by running 'clang -g -gcodeview' on the +; following code: +; 1: extern "C" volatile int x; +; 2: extern "C" void capture(int *p); +; 3: static __forceinline inline void will_be_inlined() { +; 4: int v = 3; +; 5: capture(&v); +; 6: } +; 7: extern "C" void f(int param) { +; 8: if (param) { +; 9: int a = 42; +; 10: will_be_inlined(); +; 11: capture(&a); +; 12: } else { +; 13: int b = 42; +; 14: will_be_inlined(); +; 15: capture(&b); +; 16: } +; 17: } + +; ModuleID = 't.cpp' + +; Function Attrs: nounwind uwtable +define void @f(i32 %param) #0 !dbg !4 { +entry: + %v.i1 = alloca i32, align 4 + call void @llvm.dbg.declare(metadata i32* %v.i1, metadata !15, metadata !16), !dbg !17 + %v.i = alloca i32, align 4 + call void @llvm.dbg.declare(metadata i32* %v.i, metadata !15, metadata !16), !dbg !21 + %param.addr = alloca i32, align 4 + %a = alloca i32, align 4 + %b = alloca i32, align 4 + store i32 %param, i32* %param.addr, align 4 + call void @llvm.dbg.declare(metadata i32* %param.addr, metadata !24, metadata !16), !dbg !25 + %0 = load i32, i32* %param.addr, align 4, !dbg !26 + %tobool = icmp ne i32 %0, 0, !dbg !26 + br i1 %tobool, label %if.then, label %if.else, !dbg !27 + +;CHECK: movl [[REG:.*]], 24(%esp) +;CHECK: je [[LABEL:.*]] + +if.then: ; preds = %entry + call void @llvm.dbg.declare(metadata i32* %a, metadata !28, metadata !16), !dbg !29 + store i32 42, i32* %a, align 4, !dbg !29 + store i32 3, i32* %v.i, align 4, !dbg !21 + call void @capture(i32* %v.i) #3, !dbg !30 + call void @capture(i32* %a), !dbg !31 + br label %if.end, !dbg !32 + +;CHECK: movl $3, 16(%esp) + +if.else: ; preds = %entry + call void @llvm.dbg.declare(metadata i32* %b, metadata !33, metadata !16), !dbg !34 + store i32 42, i32* %b, align 4, !dbg !34 + store i32 3, i32* %v.i1, align 4, !dbg !17 + call void @capture(i32* %v.i1) #3, !dbg !35 + call void @capture(i32* %b), !dbg !36 + br label %if.end + +;CHECK: [[LABEL]]: +;CHECK: movl $3, 20(%esp) + +if.end: ; preds = %if.else, %if.then + ret void, !dbg !37 +} + +; Function Attrs: nounwind readnone +declare void @llvm.dbg.declare(metadata, metadata, metadata) #1 + +declare void @capture(i32*) #2 + +attributes #0 = { nounwind uwtable "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2" "unsafe-fp-math"="false" "use-soft-float"="false" } +attributes #1 = { nounwind readnone } +attributes #2 = { "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2" "unsafe-fp-math"="false" "use-soft-float"="false" } +attributes #3 = { nounwind } + +!llvm.dbg.cu = !{!0} +!llvm.module.flags = !{!11, !12, !13} +!llvm.ident = !{!14} + +!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus, file: !1, producer: "clang version 3.9.0 ", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !2) +!1 = !DIFile(filename: "t.cpp", directory: "D:\5Csrc\5Cllvm\5Cbuild") +!2 = !{} +!4 = distinct !DISubprogram(name: "f", scope: !1, file: !1, line: 7, type: !5, isLocal: false, isDefinition: true, scopeLine: 7, flags: DIFlagPrototyped, isOptimized: false, unit: !0, variables: !2) +!5 = !DISubroutineType(types: !6) +!6 = !{null, !7} +!7 = !DIBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed) +!8 = distinct !DISubprogram(name: "will_be_inlined", linkageName: "\01?will_be_inlined@@YAXXZ", scope: !1, file: !1, line: 3, type: !9, isLocal: true, isDefinition: true, scopeLine: 3, flags: DIFlagPrototyped, isOptimized: false, unit: !0, variables: !2) +!9 = !DISubroutineType(types: !10) +!10 = !{null} +!11 = !{i32 2, !"CodeView", i32 1} +!12 = !{i32 2, !"Debug Info Version", i32 3} +!13 = !{i32 1, !"PIC Level", i32 2} +!14 = !{!"clang version 3.9.0 "} +!15 = !DILocalVariable(name: "v", scope: !8, file: !1, line: 4, type: !7) +!16 = !DIExpression() +!17 = !DILocation(line: 4, column: 7, scope: !8, inlinedAt: !18) +!18 = distinct !DILocation(line: 14, column: 5, scope: !19) +!19 = distinct !DILexicalBlock(scope: !20, file: !1, line: 12, column: 10) +!20 = distinct !DILexicalBlock(scope: !4, file: !1, line: 8, column: 7) +!21 = !DILocation(line: 4, column: 7, scope: !8, inlinedAt: !22) +!22 = distinct !DILocation(line: 10, column: 5, scope: !23) +!23 = distinct !DILexicalBlock(scope: !20, file: !1, line: 8, column: 14) +!24 = !DILocalVariable(name: "param", arg: 1, scope: !4, file: !1, line: 7, type: !7) +!25 = !DILocation(line: 7, column: 23, scope: !4) +!26 = !DILocation(line: 8, column: 7, scope: !20) +!27 = !DILocation(line: 8, column: 7, scope: !4) +!28 = !DILocalVariable(name: "a", scope: !23, file: !1, line: 9, type: !7) +!29 = !DILocation(line: 9, column: 9, scope: !23) +!30 = !DILocation(line: 5, column: 3, scope: !8, inlinedAt: !22) +!31 = !DILocation(line: 11, column: 5, scope: !23) +!32 = !DILocation(line: 12, column: 3, scope: !23) +!33 = !DILocalVariable(name: "b", scope: !19, file: !1, line: 13, type: !7) +!34 = !DILocation(line: 13, column: 9, scope: !19) +!35 = !DILocation(line: 5, column: 3, scope: !8, inlinedAt: !18) +!36 = !DILocation(line: 15, column: 5, scope: !19) +!37 = !DILocation(line: 17, column: 1, scope: !4) Index: test/DebugInfo/COFF/local-variables.ll =================================================================== --- test/DebugInfo/COFF/local-variables.ll +++ test/DebugInfo/COFF/local-variables.ll @@ -27,36 +27,36 @@ ; ASM: .seh_proc f ; ASM: # BB#0: # %entry ; ASM: subq $56, %rsp -; ASM: #DEBUG_VALUE: f:param <- [%RSP+44] -; ASM: movl %ecx, 44(%rsp) +; ASM: #DEBUG_VALUE: f:param <- [%RSP+52] +; ASM: movl %ecx, 52(%rsp) ; ASM: [[prologue_end:\.Ltmp.*]]: ; 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: #DEBUG_VALUE: f:param <- [%RSP+44] +; ASM: #DEBUG_VALUE: f:param <- [%RSP+52] ; ASM: #DEBUG_VALUE: a <- [%RSP+40] ; ASM: .cv_loc 0 1 9 9 # t.cpp:9:9 ; ASM: movl $42, 40(%rsp) ; ASM: [[inline_site1:\.Ltmp.*]]: ; ASM: .cv_loc 1 1 4 7 # t.cpp:4:7 -; ASM: movl $3, 48(%rsp) -; ASM: leaq 48(%rsp), %rcx +; ASM: movl $3, 44(%rsp) +; ASM: leaq 44(%rsp), %rcx ; ASM: .cv_loc 1 1 5 3 # t.cpp:5:3 ; ASM: callq capture ; ASM: leaq 40(%rsp), %rcx ; ASM: jmp .LBB0_3 ; ASM: [[else_start:\.Ltmp.*]]: ; ASM: .LBB0_2: # %if.else -; ASM: #DEBUG_VALUE: f:param <- [%RSP+44] +; ASM: #DEBUG_VALUE: f:param <- [%RSP+52] ; ASM: #DEBUG_VALUE: b <- [%RSP+36] ; ASM: .cv_loc 0 1 13 9 # t.cpp:13:9 ; ASM: movl $42, 36(%rsp) ; ASM: [[inline_site2:\.Ltmp.*]]: ; ASM: .cv_loc 2 1 4 7 # t.cpp:4:7 -; ASM: movl $3, 52(%rsp) -; ASM: leaq 52(%rsp), %rcx +; ASM: movl $3, 48(%rsp) +; ASM: leaq 48(%rsp), %rcx ; ASM: .cv_loc 2 1 5 3 # t.cpp:5:3 ; ASM: callq capture ; ASM: leaq 36(%rsp), %rcx @@ -75,7 +75,7 @@ ; ASM: .long 116 # TypeIndex ; ASM: .short 1 # Flags ; ASM: .asciz "param" -; ASM: .cv_def_range [[prologue_end]] [[param_end]], "E\021O\001\000\000,\000\000\000" +; ASM: .cv_def_range [[prologue_end]] [[param_end]], "E\021O\001\000\0004\000\000\000" ; ASM: .short 4414 # Record kind: S_LOCAL ; ASM: .long 116 # TypeIndex ; ASM: .short 0 # Flags @@ -91,14 +91,14 @@ ; ASM: .long 116 # TypeIndex ; ASM: .short 0 # Flags ; ASM: .asciz "v" -; ASM: .cv_def_range [[inline_site1]] [[else_start]], "E\021O\001\000\0000\000\000\000" +; ASM: .cv_def_range [[inline_site1]] [[else_start]], "E\021O\001\000\000,\000\000\000" ; ASM: .short 4430 # Record kind: S_INLINESITE_END ; ASM: .short 4429 # Record kind: S_INLINESITE ; ASM: .short 4414 # Record kind: S_LOCAL ; ASM: .long 116 # TypeIndex ; ASM: .short 0 # Flags ; ASM: .asciz "v" -; ASM: .cv_def_range [[inline_site2]] [[inline_site2_end]], "E\021O\001\000\0004\000\000\000" +; ASM: .cv_def_range [[inline_site2]] [[inline_site2_end]], "E\021O\001\000\0000\000\000\000" ; ASM: .short 4430 # Record kind: S_INLINESITE_END ; OBJ: Subsection [ @@ -118,7 +118,7 @@ ; OBJ: BaseRegister: 335 ; OBJ: HasSpilledUDTMember: No ; OBJ: OffsetInParent: 0 -; OBJ: BasePointerOffset: 44 +; OBJ: BasePointerOffset: 52 ; OBJ: LocalVariableAddrRange { ; OBJ: OffsetStart: .text+0x8 ; OBJ: ISectStart: 0x0 @@ -180,7 +180,7 @@ ; OBJ: BaseRegister: 335 ; OBJ: HasSpilledUDTMember: No ; OBJ: OffsetInParent: 0 -; OBJ: BasePointerOffset: 48 +; OBJ: BasePointerOffset: 44 ; OBJ: LocalVariableAddrRange { ; OBJ: OffsetStart: .text+0x14 ; OBJ: ISectStart: 0x0 @@ -210,7 +210,7 @@ ; OBJ: BaseRegister: 335 ; OBJ: HasSpilledUDTMember: No ; OBJ: OffsetInParent: 0 -; OBJ: BasePointerOffset: 52 +; OBJ: BasePointerOffset: 48 ; OBJ: LocalVariableAddrRange { ; OBJ: OffsetStart: .text+0x35 ; OBJ: ISectStart: 0x0