From ac038d9c24059fbd741d55b033d41d29e38237b2 Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Fri, 19 Feb 2016 23:55:38 +0000 Subject: [PATCH] [codeview] Fix emission of file changes in inline line tables These are supposed to be file checksum table offsets, not file ids. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@261379 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/MC/MCCodeView.cpp | 5 +- test/DebugInfo/COFF/inlining-files.ll | 109 ++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 test/DebugInfo/COFF/inlining-files.ll diff --git a/lib/MC/MCCodeView.cpp b/lib/MC/MCCodeView.cpp index 029bab1f7f8..cd19e6aa773 100644 --- a/lib/MC/MCCodeView.cpp +++ b/lib/MC/MCCodeView.cpp @@ -311,8 +311,11 @@ void CodeViewContext::encodeInlineLineTable(MCAsmLayout &Layout, WithinFunction = true; if (Loc.getFileNum() != LastLoc->getFileNum()) { + // File ids are 1 based, and each file checksum table entry is 8 bytes + // long. See emitFileChecksums above. + unsigned FileOffset = 8 * (Loc.getFileNum() - 1); compressAnnotation(ChangeFile, Buffer); - compressAnnotation(Loc.getFileNum(), Buffer); + compressAnnotation(FileOffset, Buffer); } int LineDelta = Loc.getLine() - LastLoc->getLine(); diff --git a/test/DebugInfo/COFF/inlining-files.ll b/test/DebugInfo/COFF/inlining-files.ll new file mode 100644 index 00000000000..6a4cff808a4 --- /dev/null +++ b/test/DebugInfo/COFF/inlining-files.ll @@ -0,0 +1,109 @@ +; RUN: llc -mcpu=core2 -mtriple=i686-pc-win32 < %s -filetype=obj | llvm-readobj -codeview | FileCheck %s --check-prefix=OBJ + +; This LL file was generated by running 'clang -O1 -g -gcodeview' on the +; volatile int x; +; static inline void file_change(void) { +; x++; +; #include "t.inc" +; x++; +; } +; void f(void) { +; ++x; +; file_change(); +; ++x; +; } +; t.inc contents: +; ++x; +; ++x; + +; OBJ: Subsection [ +; OBJ: SubSectionType: Symbols (0xF1) +; OBJ: ProcStart { +; OBJ: DisplayName: f +; OBJ: } +; OBJ: InlineSite { +; OBJ: PtrParent: 0x0 +; OBJ: PtrEnd: 0x0 +; OBJ: Inlinee: file_change (0x1003) +; OBJ: BinaryAnnotations [ +; OBJ: ChangeCodeOffsetAndLineOffset: {CodeOffset: 0x6, LineOffset: 1} +; OBJ: ChangeFile: D:\src\llvm\build\t.inc (0x8) +; OBJ: ChangeCodeOffsetAndLineOffset: {CodeOffset: 0x6, LineOffset: -2} +; OBJ: ChangeCodeOffsetAndLineOffset: {CodeOffset: 0x6, LineOffset: 1} +; OBJ: ChangeFile: D:\src\llvm\build\t.cpp (0x0) +; OBJ: ChangeCodeOffsetAndLineOffset: {CodeOffset: 0x6, LineOffset: 3} +; OBJ: ChangeCodeLength: 0x6 +; OBJ: ] +; OBJ: } +; OBJ: InlineSiteEnd { +; OBJ: } +; OBJ: ProcEnd +; OBJ: ] + +; ModuleID = 't.cpp' +target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128" +target triple = "x86_64-pc-windows-msvc18.0.0" + +@x = common global i32 0, align 4 + +; Function Attrs: norecurse nounwind uwtable +define void @f() #0 !dbg !4 { +entry: + %0 = load volatile i32, i32* @x, align 4, !dbg !16, !tbaa !17 + %inc = add nsw i32 %0, 1, !dbg !16 + store volatile i32 %inc, i32* @x, align 4, !dbg !16, !tbaa !17 + %1 = load volatile i32, i32* @x, align 4, !dbg !21, !tbaa !17 + %inc.i = add nsw i32 %1, 1, !dbg !21 + store volatile i32 %inc.i, i32* @x, align 4, !dbg !21, !tbaa !17 + %2 = load volatile i32, i32* @x, align 4, !dbg !23, !tbaa !17 + %inc1.i = add nsw i32 %2, 1, !dbg !23 + store volatile i32 %inc1.i, i32* @x, align 4, !dbg !23, !tbaa !17 + %3 = load volatile i32, i32* @x, align 4, !dbg !26, !tbaa !17 + %inc2.i = add nsw i32 %3, 1, !dbg !26 + store volatile i32 %inc2.i, i32* @x, align 4, !dbg !26, !tbaa !17 + %4 = load volatile i32, i32* @x, align 4, !dbg !27, !tbaa !17 + %inc3.i = add nsw i32 %4, 1, !dbg !27 + store volatile i32 %inc3.i, i32* @x, align 4, !dbg !27, !tbaa !17 + %5 = load volatile i32, i32* @x, align 4, !dbg !29, !tbaa !17 + %inc1 = add nsw i32 %5, 1, !dbg !29 + store volatile i32 %inc1, i32* @x, align 4, !dbg !29, !tbaa !17 + ret void, !dbg !30 +} + +attributes #0 = { norecurse 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" } + +!llvm.dbg.cu = !{!0} +!llvm.module.flags = !{!12, !13, !14} +!llvm.ident = !{!15} + +!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 3.9.0 ", isOptimized: true, runtimeVersion: 0, emissionKind: 1, enums: !2, subprograms: !3, globals: !8) +!1 = !DIFile(filename: "t.cpp", directory: "D:\5Csrc\5Cllvm\5Cbuild") +!2 = !{} +!3 = !{!4, !7} +!4 = distinct !DISubprogram(name: "f", scope: !1, file: !1, line: 7, type: !5, isLocal: false, isDefinition: true, scopeLine: 7, flags: DIFlagPrototyped, isOptimized: true, variables: !2) +!5 = !DISubroutineType(types: !6) +!6 = !{null} +!7 = distinct !DISubprogram(name: "file_change", scope: !1, file: !1, line: 2, type: !5, isLocal: true, isDefinition: true, scopeLine: 2, flags: DIFlagPrototyped, isOptimized: true, variables: !2) +!8 = !{!9} +!9 = !DIGlobalVariable(name: "x", scope: !0, file: !1, line: 1, type: !10, isLocal: false, isDefinition: true, variable: i32* @x) +!10 = !DIDerivedType(tag: DW_TAG_volatile_type, baseType: !11) +!11 = !DIBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed) +!12 = !{i32 2, !"CodeView", i32 1} +!13 = !{i32 2, !"Debug Info Version", i32 3} +!14 = !{i32 1, !"PIC Level", i32 2} +!15 = !{!"clang version 3.9.0 "} +!16 = !DILocation(line: 8, column: 3, scope: !4) +!17 = !{!18, !18, i64 0} +!18 = !{!"int", !19, i64 0} +!19 = !{!"omnipotent char", !20, i64 0} +!20 = !{!"Simple C/C++ TBAA"} +!21 = !DILocation(line: 3, column: 4, scope: !7, inlinedAt: !22) +!22 = distinct !DILocation(line: 9, column: 3, scope: !4) +!23 = !DILocation(line: 1, column: 1, scope: !24, inlinedAt: !22) +!24 = !DILexicalBlockFile(scope: !7, file: !25, discriminator: 0) +!25 = !DIFile(filename: "./t.inc", directory: "D:\5Csrc\5Cllvm\5Cbuild") +!26 = !DILocation(line: 2, column: 1, scope: !24, inlinedAt: !22) +!27 = !DILocation(line: 5, column: 4, scope: !28, inlinedAt: !22) +!28 = !DILexicalBlockFile(scope: !7, file: !1, discriminator: 0) +!29 = !DILocation(line: 10, column: 3, scope: !4) +!30 = !DILocation(line: 11, column: 1, scope: !4) -- 2.11.0