From f0945f48bd79669e046c9e10895112a5c5da2a08 Mon Sep 17 00:00:00 2001
From: Jonas Devlieghere <jonas@devlieghere.com>
Date: Tue, 12 Dec 2017 11:32:21 +0000
Subject: [PATCH] [dsymutil] Accept line tables up to DWARFv5.

This patch removes the hard-coded check for DWARFv2 line tables. Now
dsymutil accepts line tables for DWARF versions 2 to 5 (inclusive).

Differential revision: https://reviews.llvm.org/D41084

rdar://35968319

llvm-svn: 320469
---
 llvm/test/tools/dsymutil/Inputs/dwarf4.o      | Bin 0 -> 1912 bytes
 llvm/test/tools/dsymutil/Inputs/dwarf5.o      | Bin 0 -> 1940 bytes
 .../tools/dsymutil/X86/dwarf4-linetable.test  |  23 ++++++++++++++++++
 .../tools/dsymutil/X86/dwarf5-linetable.test  |  23 ++++++++++++++++++
 llvm/tools/dsymutil/DwarfLinker.cpp           |  11 ++++++---
 5 files changed, 54 insertions(+), 3 deletions(-)
 create mode 100644 llvm/test/tools/dsymutil/Inputs/dwarf4.o
 create mode 100644 llvm/test/tools/dsymutil/Inputs/dwarf5.o
 create mode 100644 llvm/test/tools/dsymutil/X86/dwarf4-linetable.test
 create mode 100644 llvm/test/tools/dsymutil/X86/dwarf5-linetable.test

diff --git a/llvm/test/tools/dsymutil/Inputs/dwarf4.o b/llvm/test/tools/dsymutil/Inputs/dwarf4.o
new file mode 100644
index 0000000000000000000000000000000000000000..0c6487ac974c2d70fe40104abd711cfcf9c7f6ba
GIT binary patch
literal 1912
zcmb7F&rcIk5T5O}1u0z?F%hFNYk~>*qf|hNVx$C+8Z{CG#DjTm%L0q-cC#!6jftF$
z+`Q_^KfynN#Dno92mKG^XyRE7b!K<AKNbi$$-M8)>&&;`ynS!`_4m)+CICqW9MGfa
z+caqCXs6KUC_ca*MEoCqaZV5;Cy*z(P6*dncR4^1VtRaTx)uksHl7e)!(*ec5#$gG
zF>mBn7sZO}c*{bJJsO$1T}=siW_hL3K;|v7az7#9({nk;C=-7ppTRr>j59Hw)L>se
z(^@D|N|^5**WG2@WWEe;8WZiy=jhg=v9g!%2lE8*?TGq{dft;5))(;6nIJoyPq*!Y
zAuPQ}^7iz*<FNqTWc+@pKA*3YTh3ESSl>Ao*2R47ah}v5w10K_Y&{?58xQeaJtCj`
z+}^ielldlC&*MY+@}(l`a>c5(W?J(?+#9R40`QUfG+z9Gd~|0g@x1U)p?-}evEbm_
z@C(BCZJUcS%(umS96|zMDVP%m_oHB19%Fd_RDSw!P(+s>ZSDYl^xjlTNVd@Eo%v40
zr<`viHe-xBU=qFFNIJ`}Up~@&CcC+FW$W|!U&?;+DPO?*q?HY4#VlFcwNyHl*1BD1
z)q1A&_oe%;5B6x?g+jU5TV3lPNcX_}n(izNr1H>fJ7!sTjb68CLs2&^FfA9PcImv*
z5t9}5<Y}c{I*xlANdZkVow9NxF_gH|F^peUxeH|FRw6-7PM}9g6f}FiwZfnm0c02n
z=(ARR&lE_r_i2<yag?WUh#^V#;Yc>vB*Ip7GJnlKiOa9vzr2KNUOD0gN<gcxr8rz$
zLHpkvdhQ7#L-YS=;)pTqmpTVXZ@fv+hn4hGE;U03q|W$zPQNx-Kr6kN0%={9)Yhiv
zx0prcXVBGM5?rZpJ-~>fzK)D0{Y?NE!kj2*I7*WAM@bUUL(rw#YsLkDW7Un9Vsguu
dNCb1?qMsW-%See>8^6p*Tx~Q2CcIMu{{R?C!!7^-

literal 0
HcmV?d00001

diff --git a/llvm/test/tools/dsymutil/Inputs/dwarf5.o b/llvm/test/tools/dsymutil/Inputs/dwarf5.o
new file mode 100644
index 0000000000000000000000000000000000000000..a9767f6d93762c341acffc20e12d5a2d5ca30573
GIT binary patch
literal 1940
zcmb7FUr!T35TEUFP$@l%n26EDi@^k<DHRCBKT%LXOfWGBNQ`E4Ee9N4ug&!+Xh`JA
zNaBO9`U(69KAQNTKIx0bFMw|*KC7Y5+|BjR0RbnO{mpD=emA>2yZ!w8=S~ZNPyh$i
zCe$x9=%^?sQ0K|tN9<Ve!!M2redGkvB<D%#nd=@q2vW|B&(GBS&}wIc_!>Uj1e;+D
zp_B_|c6CXXJlCI=a_rvd^h7lz<eB4{N&}fc$(08IA)k@Wx@MX98~IG;8DyMQ*{H#u
ze3r9VppYovE6$r@++w~5xM@tZC!cFLOJ->|-!}7v@b!@O<&B(QVzj=Hk9vaSU_PT*
zv`y(4c`9$$dVlyV09P2l9avw$SIDm9C?#6o87{1w`HnWTQG>|-)zw!ta#6mC2;a~l
z`Mk%)J=eR!d^fqC`v>yn3VE!{ldH~}<t#`!HC9^+z+2|idGZbN(VexiU-+lUdd+3I
z=;CPv3DNuZos&kG?<4cE3kiVb&?XG;hiy4NV|4$z`0L@7j??8w@%E{Y&Mid&$yOTu
zp6^23;P@AaarChcxPw|RR63VmKYb{Bc5-X`!n+USe<}Lm`<#vUNiUmj$tpPdP&$*&
z=sljh>O9g1`ZN6(hkNxN+b-w(s&fN_nO;~}Gu*|&bPoE8u2nWXv(L*HA#Yd?SdIsx
zL!8w*RYgl3KdE&H>djah$QbETv`dN0iCdl5@MTrHLD8-z612!kR22lRIapj943mvA
z;*Y^V?^^Ys$q{q6X%y5g$}|pY6O!E>oeX!0unm<Ym<w8Q<>~8<^El_HBc7uGl=@uq
zqq!B7|Ba#V9wRc8;Gd=$QN<UYmJX2Fe4e0}mFlNhS`2l_ZsB*Gf*K@b7f+@^tfxe(
zttI{vqlo1cYJ7+4u2eW5U{p&zi`_^DdlB@QiXAtAu|kMHT9SZ1gNjC6G#qtI#AEHE
m+6Dkes)r&}rS(%RhDo%$nB9Du5yAJbGZK3{4WUTCgWw-6;mKYA

literal 0
HcmV?d00001

diff --git a/llvm/test/tools/dsymutil/X86/dwarf4-linetable.test b/llvm/test/tools/dsymutil/X86/dwarf4-linetable.test
new file mode 100644
index 000000000000..39de076ca016
--- /dev/null
+++ b/llvm/test/tools/dsymutil/X86/dwarf4-linetable.test
@@ -0,0 +1,23 @@
+# RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs/ -y %s -o - | llvm-dwarfdump -debug-line - | FileCheck %s
+
+# Source:
+#   int main() {
+#     return 0;
+#   }
+# Compile with:
+#   clang -gdwarf-4 dwarf4.c -c -o dwarf4.o
+
+---
+triple:          'x86_64-apple-darwin'
+objects:
+  - filename:        dwarf4.o
+    timestamp:       1513021112
+    symbols:
+      - { sym: _main, objAddr: 0x0000000000000000, binAddr: 0x0000000100000FA0, size: 0x0000000F }
+...
+
+# CHECK: .debug_line contents:
+# CHECK: debug_line
+# CHECK: Line table prologue:
+# CHECK: total_length:
+# CHECK: version: 4
diff --git a/llvm/test/tools/dsymutil/X86/dwarf5-linetable.test b/llvm/test/tools/dsymutil/X86/dwarf5-linetable.test
new file mode 100644
index 000000000000..8622c37dc4c7
--- /dev/null
+++ b/llvm/test/tools/dsymutil/X86/dwarf5-linetable.test
@@ -0,0 +1,23 @@
+# RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs/ -y %s -o - | llvm-dwarfdump -debug-line - | FileCheck %s
+
+# Source:
+#   int main() {
+#     return 0;
+#   }
+# Compile with:
+#   clang -gdwarf-5 dwarf5.c -c -o dwarf5.o
+
+---
+triple:          'x86_64-apple-darwin'
+objects:
+  - filename:        dwarf5.o
+    timestamp:       1513021112
+    symbols:
+      - { sym: _main, objAddr: 0x0000000000000000, binAddr: 0x0000000100000FA0, size: 0x0000000F }
+...
+
+# CHECK: .debug_line contents:
+# CHECK: debug_line
+# CHECK: Line table prologue:
+# CHECK: total_length:
+# CHECK: version: 5
diff --git a/llvm/tools/dsymutil/DwarfLinker.cpp b/llvm/tools/dsymutil/DwarfLinker.cpp
index 68f1505de1c4..50ffc69dfaa0 100644
--- a/llvm/tools/dsymutil/DwarfLinker.cpp
+++ b/llvm/tools/dsymutil/DwarfLinker.cpp
@@ -3232,16 +3232,21 @@ void DwarfLinker::patchLineTableForUnit(CompileUnit &Unit,
   }
 
   // Finished extracting, now emit the line tables.
-  uint32_t PrologueEnd = *StmtList + 10 + LineTable.Prologue.PrologueLength;
-  // FIXME: LLVM hardcodes it's prologue values. We just copy the
+  // FIXME: LLVM hardcodes its prologue values. We just copy the
   // prologue over and that works because we act as both producer and
   // consumer. It would be nicer to have a real configurable line
   // table emitter.
-  if (LineTable.Prologue.getVersion() != 2 ||
+  if (LineTable.Prologue.getVersion() < 2 ||
+      LineTable.Prologue.getVersion() > 5 ||
       LineTable.Prologue.DefaultIsStmt != DWARF2_LINE_DEFAULT_IS_STMT ||
       LineTable.Prologue.OpcodeBase > 13)
     reportWarning("line table parameters mismatch. Cannot emit.");
   else {
+    uint32_t PrologueEnd = *StmtList + 10 + LineTable.Prologue.PrologueLength;
+    // DWARFv5 has an extra 2 bytes of information before the header_length
+    // field.
+    if (LineTable.Prologue.getVersion() == 5)
+      PrologueEnd += 2;
     StringRef LineData = OrigDwarf.getDWARFObj().getLineSection().Data;
     MCDwarfLineTableParams Params;
     Params.DWARF2LineOpcodeBase = LineTable.Prologue.OpcodeBase;