[PATCH] D73042: [DWARF] Eliminate the DWARFDebugNames::Header::Padding field.

[Igor Kudrin via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rG8306f55bfa2b: [DWARF] Eliminate the DWARFDebugNames::Header::Padding field. (authored by ikudrin).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D73042/new/

https://reviews.llvm.org/D73042

Files:
  llvm/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h
  llvm/lib/DebugInfo/DWARF/DWARFAcceleratorTable.cpp
  llvm/test/DebugInfo/X86/dwarfdump-debug-names.s


Index: llvm/test/DebugInfo/X86/dwarfdump-debug-names.s
===================================================================
--- llvm/test/DebugInfo/X86/dwarfdump-debug-names.s
+++ llvm/test/DebugInfo/X86/dwarfdump-debug-names.s
@@ -98,7 +98,6 @@
 # CHECK-NEXT:   Header {
 # CHECK-NEXT:     Length: 0x60
 # CHECK-NEXT:     Version: 5
-# CHECK-NEXT:     Padding: 0x0
 # CHECK-NEXT:     CU count: 1
 # CHECK-NEXT:     Local TU count: 0
 # CHECK-NEXT:     Foreign TU count: 0
@@ -144,7 +143,6 @@
 # CHECK-NEXT:   Header {
 # CHECK-NEXT:     Length: 0x44
 # CHECK-NEXT:     Version: 5
-# CHECK-NEXT:     Padding: 0x0
 # CHECK-NEXT:     CU count: 1
 # CHECK-NEXT:     Local TU count: 0
 # CHECK-NEXT:     Foreign TU count: 0
Index: llvm/lib/DebugInfo/DWARF/DWARFAcceleratorTable.cpp
===================================================================
--- llvm/lib/DebugInfo/DWARF/DWARFAcceleratorTable.cpp
+++ llvm/lib/DebugInfo/DWARF/DWARFAcceleratorTable.cpp
@@ -366,7 +366,6 @@
   DictScope HeaderScope(W, "Header");
   W.printHex("Length", UnitLength);
   W.printNumber("Version", Version);
-  W.printHex("Padding", Padding);
   W.printNumber("CU count", CompUnitCount);
   W.printNumber("Local TU count", LocalTypeUnitCount);
   W.printNumber("Foreign TU count", ForeignTypeUnitCount);
@@ -397,7 +396,8 @@
 
   UnitLength = AS.getU32(Offset);
   Version = AS.getU16(Offset);
-  Padding = AS.getU16(Offset);
+  // Skip padding
+  *Offset += 2;
   CompUnitCount = AS.getU32(Offset);
   LocalTypeUnitCount = AS.getU32(Offset);
   ForeignTypeUnitCount = AS.getU32(Offset);
Index: llvm/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h
===================================================================
--- llvm/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h
+++ llvm/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h
@@ -231,7 +231,6 @@
   struct Header {
     uint32_t UnitLength;
     uint16_t Version;
-    uint16_t Padding;
     uint32_t CompUnitCount;
     uint32_t LocalTypeUnitCount;
     uint32_t ForeignTypeUnitCount;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D73042.239789.patch
Type: text/x-patch
Size: 2035 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200123/e2c7aaa9/attachment.bin>