[PATCH] D48452: [DWARFv5] Allow ".loc 0" to refer to the root file

[Paul Robinson via Phabricator via llvm-commits]

probinson created this revision.
probinson added reviewers: dblaikie, aprantl.
probinson added a project: debug-info.
Herald added subscribers: llvm-commits, JDevlieghere, hiraditya, arichardson, emaste.
Herald added a reviewer: espindola.

DWARF v5 explicitly represents file #0 in the line table.  Prior
versions did not, so ".loc 0" is still an error in those cases.

I think this is the next-to-last bit for v5 line tables.  I still need to persuade MCDwarf to return file number 0 when looking up the root file (currently the root file ends up in the file table twice).


Repository:
  rL LLVM

https://reviews.llvm.org/D48452

Files:
  llvm/include/llvm/MC/MCDwarf.h
  llvm/lib/MC/MCContext.cpp
  llvm/lib/MC/MCParser/AsmParser.cpp
  llvm/test/MC/ELF/dwarf-loc0.s


Index: llvm/test/MC/ELF/dwarf-loc0.s
===================================================================
--- /dev/null
+++ llvm/test/MC/ELF/dwarf-loc0.s
@@ -0,0 +1,26 @@
+# RUN: llvm-mc -dwarf-version 5 %s -filetype=obj -o - | llvm-dwarfdump -debug-line - | FileCheck %s
+# RUN: not llvm-mc -dwarf-version 4 %s -filetype=asm -o - 2>&1 | FileCheck %s -check-prefix=ERR
+# REQUIRES: default_triple
+# Darwin is stuck on DWARF v2.
+# XFAIL: darwin
+# Show that ".loc 0" works in DWARF v5, gets an error for earlier versions.
+        .file 0 "root.cpp"
+        .file 1 "header.h"
+	.loc  0 10 0
+        nop
+        .loc  1 20 0
+        nop
+
+# CHECK:      file_names[ 0]:
+# CHECK-NEXT: name: "root.cpp"
+# CHECK:      file_names[ 1]:
+# CHECK-NEXT: name: "header.h"
+# CHECK:      Address Line Column File
+# CHECK-NEXT: -------
+# CHECK-NEXT: 0x{{0+}}0 10 0 0
+# CHECK-NEXT: 0x{{0+}}1 20 0 1
+# CHECK-NEXT: 0x{{0+}}2 20 0 1 {{.*}} end_sequence
+
+# ERR:      file number less than one in '.loc' directive
+# ERR-NEXT: .loc 0 10 0
+# ERR-NEXT: ^
Index: llvm/lib/MC/MCParser/AsmParser.cpp
===================================================================
--- llvm/lib/MC/MCParser/AsmParser.cpp
+++ llvm/lib/MC/MCParser/AsmParser.cpp
@@ -3412,7 +3412,7 @@
   int64_t FileNumber = 0, LineNumber = 0;
   SMLoc Loc = getTok().getLoc();
   if (parseIntToken(FileNumber, "unexpected token in '.loc' directive") ||
-      check(FileNumber < 1, Loc,
+      check(FileNumber < 1 && Ctx.getDwarfVersion() < 5, Loc,
             "file number less than one in '.loc' directive") ||
       check(!getContext().isValidDwarfFileNumber(FileNumber), Loc,
             "unassigned file number in '.loc' directive"))
Index: llvm/lib/MC/MCContext.cpp
===================================================================
--- llvm/lib/MC/MCContext.cpp
+++ llvm/lib/MC/MCContext.cpp
@@ -556,11 +556,13 @@
 /// isValidDwarfFileNumber - takes a dwarf file number and returns true if it
 /// currently is assigned and false otherwise.
 bool MCContext::isValidDwarfFileNumber(unsigned FileNumber, unsigned CUID) {
-  const SmallVectorImpl<MCDwarfFile> &MCDwarfFiles = getMCDwarfFiles(CUID);
-  if (FileNumber == 0 || FileNumber >= MCDwarfFiles.size())
+  const MCDwarfLineTable &LineTable = getMCDwarfLineTable(CUID);
+  if (FileNumber == 0)
+    return getDwarfVersion() >= 5 && LineTable.hasRootFile();
+  if (FileNumber >= LineTable.getMCDwarfFiles().size())
     return false;
 
-  return !MCDwarfFiles[FileNumber].Name.empty();
+  return !LineTable.getMCDwarfFiles()[FileNumber].Name.empty();
 }
 
 /// Remove empty sections from SectionStartEndSyms, to avoid generating
Index: llvm/include/llvm/MC/MCDwarf.h
===================================================================
--- llvm/include/llvm/MC/MCDwarf.h
+++ llvm/include/llvm/MC/MCDwarf.h
@@ -314,10 +314,13 @@
 
   void resetRootFile() {
     assert(Header.MCDwarfFiles.empty());
+    Header.RootFile.Name.clear();
     Header.resetMD5Usage();
     Header.HasSource = false;
   }
 
+  bool hasRootFile() const { return !Header.RootFile.Name.empty(); }
+
   // Report whether MD5 usage has been consistent (all-or-none).
   bool isMD5UsageConsistent() const { return Header.isMD5UsageConsistent(); }
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D48452.152371.patch
Type: text/x-patch
Size: 3241 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180621/d5187ac4/attachment.bin>