Author: Amy Huang Date: 2020-11-30T14:27:35-08:00 New Revision: 00bbef2bb20cf212722de282e4eb9afd09ab50db
URL: https://github.com/llvm/llvm-project/commit/00bbef2bb20cf212722de282e4eb9afd09ab50db DIFF: https://github.com/llvm/llvm-project/commit/00bbef2bb20cf212722de282e4eb9afd09ab50db.diff LOG: [llvm-symbolizer] Fix native symbolization on windows for inline sites. The existing code handles this correctly and I checked that the code in NativeInlineSiteSymbol also handles this correctly, but it was wrong in the NativeFunctionSymbol code. Differential Revision: https://reviews.llvm.org/D92134 Added: Modified: lld/test/COFF/symbolizer-inline.s llvm/lib/DebugInfo/PDB/Native/NativeFunctionSymbol.cpp Removed: ################################################################################ diff --git a/lld/test/COFF/symbolizer-inline.s b/lld/test/COFF/symbolizer-inline.s index c0db693f784c..9cf33b5d74a3 100644 --- a/lld/test/COFF/symbolizer-inline.s +++ b/lld/test/COFF/symbolizer-inline.s @@ -3,6 +3,7 @@ # RUN: lld-link -entry:main -nodefaultlib %t.obj -out:%t.exe -pdb:%t.pdb -debug # RUN: llvm-symbolizer --obj=%t.exe --use-native-pdb-reader --relative-address \ # RUN: 0x1014 0x1018 0x101c 0x1023 0x1024 | FileCheck %s +# RUN: 0x1037 0x103A 0x104B 0x104E | FileCheck %s # Compiled from this cpp code, with modifications to add extra inline line and # file changes: @@ -12,43 +13,16 @@ # return x + 1; # } # __attribute__((always_inline)) int inlinee_1(int x) { -# return inlinee_2(x) + 1; +# return inlinee_2(x) + 2; # } # int main() { -# return inlinee_1(33); +# int x = inlinee_1(33); +# int y = inlinee_2(22); +# int z = inlinee_2(11); +# return x + y + z; # } - -# CHECK: inlinee_1 -# CHECK-NEXT: C:\src\test.cpp:9:0 -# CHECK-NEXT: main -# CHECK-NEXT: C:\src\test.cpp:13:10 - -# CHECK: inlinee_1 -# CHECK-NEXT: C:\src\test.cpp:10:0 -# CHECK-NEXT: main -# CHECK-NEXT: C:\src\test.cpp:13:10 - -# CHECK: inlinee_2 -# CHECK-NEXT: C:\src\test.cpp:5:0 -# CHECK-NEXT: inlinee_1 -# CHECK-NEXT: C:\src\test.cpp:9:0 -# CHECK-NEXT: main -# CHECK-NEXT: C:\src\test.cpp:13:10 - -# CHECK: inlinee_2 -# CHECK-NEXT: C:\src\file.cpp:5:0 -# CHECK-NEXT: inlinee_1 -# CHECK-NEXT: C:\src\test.cpp:9:0 -# CHECK-NEXT: main -# CHECK-NEXT: C:\src\test.cpp:13:10 - -# CHECK: inlinee_1 -# CHECK-NEXT: C:\src\test.cpp:9:0 -# CHECK-NEXT: main -# CHECK-NEXT: C:\src\test.cpp:13:10 - - .text + .text .def @feat.00; .scl 3; .type 0; @@ -65,45 +39,118 @@ main: # @main .Lfunc_begin0: .cv_func_id 0 - .cv_file 1 "C:\\src\\test.cpp" "4BECA437CFE062C7D0B74B1851B65988" 1 - .cv_file 2 "C:\\src\\file.cpp" "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" 1 - .cv_loc 0 1 12 0 # test.cpp:12:0 + .cv_file 1 "C:\\src\\test.cpp" "67680A954FC00F980188190C8D23C68E" 1 + .cv_file 2 "C:\\src\\fakefile.cpp" "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" 1 + .cv_loc 0 1 9 0 # test.cpp:9:0 # %bb.0: # %entry - subq $16, %rsp - movl $0, 4(%rsp) - movl $33, 8(%rsp) + subq $32, %rsp + movl $0, 12(%rsp) + movl $33, 16(%rsp) .Ltmp0: - .cv_inline_site_id 1 within 0 inlined_at 1 13 10 - .cv_loc 1 1 9 20 # test.cpp:9:20 - movl 8(%rsp), %eax - .cv_loc 1 1 10 0 # test.cpp:10:0 - movl %eax, 12(%rsp) + .cv_inline_site_id 1 within 0 inlined_at 1 10 11 + .cv_loc 1 1 6 20 # test.cpp:6:20 + +# CHECK: inlinee_1 +# CHECK-NEXT: C:\src\test.cpp:6:0 +# CHECK-NEXT: main +# CHECK-NEXT: C:\src\test.cpp:10:11 + movl 16(%rsp), %eax + +# Add a line change here. + .cv_loc 1 1 7 7 + +# CHECK: inlinee_1 +# CHECK-NEXT: C:\src\test.cpp:7:0 +# CHECK-NEXT: main +# CHECK-NEXT: C:\src\test.cpp:10:11 + movl %eax, 20(%rsp) .Ltmp1: - .cv_inline_site_id 2 within 1 inlined_at 1 9 10 - .cv_loc 2 1 5 10 # test.cpp:5:10 - movl 12(%rsp), %eax - .cv_loc 2 1 5 12 # test.cpp:5:12 + .cv_inline_site_id 2 within 1 inlined_at 1 6 10 + .cv_loc 2 1 2 10 # test.cpp:2:10 + +# CHECK: inlinee_2 +# CHECK-NEXT: C:\src\test.cpp:2:0 +# CHECK-NEXT: inlinee_1 +# CHECK-NEXT: C:\src\test.cpp:6:0 +# CHECK-NEXT: main +# CHECK-NEXT: C:\src\test.cpp:10:11 + movl 20(%rsp), %eax + .cv_loc 2 1 2 12 # test.cpp:2:12 addl $1, %eax - .cv_loc 2 2 5 13 # file.cpp:5:13 + +# Add a file change. + .cv_loc 2 2 102 0 # fakefile.cpp:102:0 + +# CHECK: inlinee_2 +# CHECK-NEXT: C:\src\fakefile.cpp:102:0 +# CHECK-NEXT: inlinee_1 +# CHECK-NEXT: C:\src\test.cpp:6:0 +# CHECK-NEXT: main +# CHECK-NEXT: C:\src\test.cpp:10:11 nop + .Ltmp2: - .cv_loc 1 1 9 23 # test.cpp:9:23 - addl $1, %eax + .cv_loc 1 1 6 23 # test.cpp:6:23 + +# CHECK: inlinee_1 +# CHECK-NEXT: C:\src\test.cpp:6:0 +# CHECK-NEXT: main +# CHECK-NEXT: C:\src\test.cpp:10:11 + addl $2, %eax .Ltmp3: + .cv_loc 0 1 10 7 # test.cpp:10:7 + movl %eax, 8(%rsp) + movl $22, 28(%rsp) +.Ltmp4: +# Add a .cv_loc 0 so there is a gap in the inline site. +# CHECK: main +# CHECK-NEXT: C:\src\test.cpp:0:0 + +# CHECK: inlinee_2 +# CHECK-NEXT: C:\src\test.cpp:2:0 +# CHECK-NEXT: main +# CHECK-NEXT: C:\src\test.cpp:11:11 + .cv_inline_site_id 3 within 0 inlined_at 1 11 11 + .cv_loc 3 1 2 10 # test.cpp:2:10 + movl 28(%rsp), %eax + .cv_loc 0 1 0 0 + nop + .cv_loc 3 1 2 12 # test.cpp:2:12 + addl $1, %eax +.Ltmp5: + .cv_loc 0 1 11 7 # test.cpp:11:7 + movl %eax, 4(%rsp) + movl $11, 24(%rsp) +.Ltmp6: +# Same test as above but modify the .cv_inline_linetable to use an annotation +# that clang doesn't emit. +# CHECK-NOT: inlinee_2 +# CHECK: main +# CHECK-NEXT: C:\src\test.cpp:11:7 + +# CHECK: inlinee_2 +# CHECK-NEXT: C:\src\test.cpp:1:0 +# CHECK-NEXT: main +# CHECK-NEXT: C:\src\test.cpp:11:7 +.cv_inline_site_id 4 within 0 inlined_at 1 0 0 + movl 24(%rsp), %eax + nop + addl $1, %eax +.Ltmp7: .cv_loc 0 1 13 3 # test.cpp:13:3 - addq $16, %rsp + addq $32, %rsp retq -.Ltmp4: +.Ltmp8: .Lfunc_end0: # -- End function .section .debug$S,"dr" .p2align 2 .long 4 # Debug section magic .long 241 - .long .Ltmp6-.Ltmp5 # Subsection size -.Ltmp5: - .short .Ltmp8-.Ltmp7 # Record length -.Ltmp7: + .long .Ltmp10-.Ltmp9 # Subsection size +.Ltmp9: + .short .Ltmp12-.Ltmp11 # Record length +.Ltmp11: .short 4412 # Record kind: S_COMPILE3 .long 1 # Flags and language .short 208 # CPUType @@ -115,32 +162,32 @@ main: # @main .short 0 .short 0 .short 0 - .asciz "clang version 12.0.0 (https://github.com/llvm/llvm-project.git 6a4850e9c1cc74cc67f99f1f81a8fe060a7088d2)" # Null-terminated compiler version string + .asciz "clang version 12.0.0 (https://github.com/llvm/llvm-project.git 2ef947fe318d081b12add3d411bbb2af6373c66d)" # Null-terminated compiler version string .p2align 2 -.Ltmp8: -.Ltmp6: +.Ltmp12: +.Ltmp10: .p2align 2 .long 246 # Inlinee lines subsection - .long .Ltmp10-.Ltmp9 # Subsection size -.Ltmp9: + .long .Ltmp14-.Ltmp13 # Subsection size +.Ltmp13: .long 0 # Inlinee lines signature - # Inlined function inlinee_1 starts at test.cpp:8 + # Inlined function inlinee_1 starts at test.cpp:5 .long 4098 # Type index of inlined function .cv_filechecksumoffset 1 # Offset into filechecksum table - .long 8 # Starting line number + .long 5 # Starting line number - # Inlined function inlinee_2 starts at test.cpp:4 + # Inlined function inlinee_2 starts at test.cpp:1 .long 4099 # Type index of inlined function .cv_filechecksumoffset 1 # Offset into filechecksum table - .long 4 # Starting line number -.Ltmp10: + .long 1 # Starting line number +.Ltmp14: .p2align 2 .long 241 # Symbol subsection for main - .long .Ltmp12-.Ltmp11 # Subsection size -.Ltmp11: - .short .Ltmp14-.Ltmp13 # Record length -.Ltmp13: + .long .Ltmp16-.Ltmp15 # Subsection size +.Ltmp15: + .short .Ltmp18-.Ltmp17 # Record length +.Ltmp17: .short 4423 # Record kind: S_GPROC32_ID .long 0 # PtrParent .long 0 # PtrEnd @@ -154,11 +201,11 @@ main: # @main .byte 0 # Flags .asciz "main" # Function name .p2align 2 -.Ltmp14: - .short .Ltmp16-.Ltmp15 # Record length -.Ltmp15: +.Ltmp18: + .short .Ltmp20-.Ltmp19 # Record length +.Ltmp19: .short 4114 # Record kind: S_FRAMEPROC - .long 16 # FrameSize + .long 32 # FrameSize .long 0 # Padding .long 0 # Offset of padding .long 0 # Bytes of callee saved registers @@ -166,64 +213,133 @@ main: # @main .short 0 # Exception handler section .long 81920 # Flags (defines frame register) .p2align 2 -.Ltmp16: - .short .Ltmp18-.Ltmp17 # Record length -.Ltmp17: +.Ltmp20: + .short .Ltmp22-.Ltmp21 # Record length +.Ltmp21: + .short 4414 # Record kind: S_LOCAL + .long 116 # TypeIndex + .short 0 # Flags + .asciz "x" + .p2align 2 +.Ltmp22: + .cv_def_range .Ltmp0 .Ltmp8, frame_ptr_rel, 8 + .short .Ltmp24-.Ltmp23 # Record length +.Ltmp23: + .short 4414 # Record kind: S_LOCAL + .long 116 # TypeIndex + .short 0 # Flags + .asciz "y" + .p2align 2 +.Ltmp24: + .cv_def_range .Ltmp0 .Ltmp8, frame_ptr_rel, 4 + .short .Ltmp26-.Ltmp25 # Record length +.Ltmp25: + .short 4414 # Record kind: S_LOCAL + .long 116 # TypeIndex + .short 0 # Flags + .asciz "z" + .p2align 2 +.Ltmp26: + .cv_def_range .Ltmp0 .Ltmp8, frame_ptr_rel, 0 + .short .Ltmp28-.Ltmp27 # Record length +.Ltmp27: .short 4429 # Record kind: S_INLINESITE .long 0 # PtrParent .long 0 # PtrEnd .long 4098 # Inlinee type index - .cv_inline_linetable 1 1 8 .Lfunc_begin0 .Lfunc_end0 + .cv_inline_linetable 1 1 5 .Lfunc_begin0 .Lfunc_end0 .p2align 2 -.Ltmp18: - .short .Ltmp20-.Ltmp19 # Record length -.Ltmp19: +.Ltmp28: + .short .Ltmp30-.Ltmp29 # Record length +.Ltmp29: .short 4414 # Record kind: S_LOCAL .long 116 # TypeIndex .short 1 # Flags .asciz "x" .p2align 2 -.Ltmp20: - .cv_def_range .Ltmp0 .Ltmp3, frame_ptr_rel, 8 - .short .Ltmp22-.Ltmp21 # Record length -.Ltmp21: +.Ltmp30: + .cv_def_range .Ltmp0 .Ltmp3, frame_ptr_rel, 16 + .short .Ltmp32-.Ltmp31 # Record length +.Ltmp31: .short 4429 # Record kind: S_INLINESITE .long 0 # PtrParent .long 0 # PtrEnd .long 4099 # Inlinee type index - .cv_inline_linetable 2 1 4 .Lfunc_begin0 .Lfunc_end0 + .cv_inline_linetable 2 1 1 .Lfunc_begin0 .Lfunc_end0 .p2align 2 -.Ltmp22: - .short .Ltmp24-.Ltmp23 # Record length -.Ltmp23: +.Ltmp32: + .short .Ltmp34-.Ltmp33 # Record length +.Ltmp33: .short 4414 # Record kind: S_LOCAL .long 116 # TypeIndex .short 1 # Flags .asciz "x" .p2align 2 -.Ltmp24: - .cv_def_range .Ltmp1 .Ltmp2, frame_ptr_rel, 12 +.Ltmp34: + .cv_def_range .Ltmp1 .Ltmp2, frame_ptr_rel, 20 .short 2 # Record length .short 4430 # Record kind: S_INLINESITE_END .short 2 # Record length .short 4430 # Record kind: S_INLINESITE_END + .short .Ltmp36-.Ltmp35 # Record length +.Ltmp35: + .short 4429 # Record kind: S_INLINESITE + .long 0 # PtrParent + .long 0 # PtrEnd + .long 4099 # Inlinee type index + .cv_inline_linetable 3 1 1 .Lfunc_begin0 .Lfunc_end0 + .p2align 2 +.Ltmp36: + .short .Ltmp38-.Ltmp37 # Record length +.Ltmp37: + .short 4414 # Record kind: S_LOCAL + .long 116 # TypeIndex + .short 1 # Flags + .asciz "x" + .p2align 2 +.Ltmp38: + .cv_def_range .Ltmp4 .Ltmp5, frame_ptr_rel, 28 + .short 2 # Record length + .short 4430 # Record kind: S_INLINESITE_END + .short .Ltmp40-.Ltmp39 # Record length +.Ltmp39: + .short 4429 # Record kind: S_INLINESITE + .long 0 # PtrParent + .long 0 # PtrEnd + .long 4099 # Inlinee type index +# Changed inline line table annotations. + .byte 0x0C, 0x4, 0x47 + .byte 0x0C, 0x3, 0x5 + .p2align 2 +.Ltmp40: + .short .Ltmp42-.Ltmp41 # Record length +.Ltmp41: + .short 4414 # Record kind: S_LOCAL + .long 116 # TypeIndex + .short 1 # Flags + .asciz "x" + .p2align 2 +.Ltmp42: + .cv_def_range .Ltmp6 .Ltmp7, frame_ptr_rel, 24 + .short 2 # Record length + .short 4430 # Record kind: S_INLINESITE_END .short 2 # Record length .short 4431 # Record kind: S_PROC_ID_END -.Ltmp12: +.Ltmp16: .p2align 2 .cv_linetable 0, main, .Lfunc_end0 .cv_filechecksums # File index to string table offset subsection .cv_stringtable # String table .long 241 - .long .Ltmp26-.Ltmp25 # Subsection size -.Ltmp25: - .short .Ltmp28-.Ltmp27 # Record length -.Ltmp27: + .long .Ltmp44-.Ltmp43 # Subsection size +.Ltmp43: + .short .Ltmp46-.Ltmp45 # Record length +.Ltmp45: .short 4428 # Record kind: S_BUILDINFO .long 4105 # LF_BUILDINFO index .p2align 2 -.Ltmp28: -.Ltmp26: +.Ltmp46: +.Ltmp44: .p2align 2 .section .debug$T,"dr" .p2align 2 @@ -279,10 +395,12 @@ main: # @main .byte 242 .byte 241 # StringId (0x1007) - .short 0xe # Record length + .short 0x2a # Record length .short 0x1605 # Record kind: LF_STRING_ID .long 0x0 # Id - .asciz "C:\\src" # StringData + .asciz "C:\\src\\tests\\symbolizer\\asm-test" # StringData + .byte 243 + .byte 242 .byte 241 # StringId (0x1008) .short 0xe # Record length diff --git a/llvm/lib/DebugInfo/PDB/Native/NativeFunctionSymbol.cpp b/llvm/lib/DebugInfo/PDB/Native/NativeFunctionSymbol.cpp index 708ed36eb50b..7f3b35c297b4 100644 --- a/llvm/lib/DebugInfo/PDB/Native/NativeFunctionSymbol.cpp +++ b/llvm/lib/DebugInfo/PDB/Native/NativeFunctionSymbol.cpp @@ -78,10 +78,7 @@ static bool inlineSiteContainsAddress(InlineSiteSym &IS, break; case BinaryAnnotationsOpCode::ChangeCodeLengthAndCodeOffset: CodeOffset += Annot.U2; - if (OffsetInFunc >= CodeOffset) - Found = true; - CodeOffset += Annot.U1; - if (Found && OffsetInFunc < CodeOffset) + if (OffsetInFunc >= CodeOffset && OffsetInFunc < CodeOffset + Annot.U1) return true; Found = false; break; _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
