fixup: Fix the alignment of the description if the name is empty

Author: igorkudrin

llvm/lib/ObjectYAML/ELFEmitter.cpp

@@ -1834,14 +1834,15 @@ void ELFState<ELFT>::writeSectionContent(Elf_Shdr &SHeader,
     if (!NE.Name.empty()) {
       CBA.write(NE.Name.data(), NE.Name.size());
       CBA.write('\0');
-      CBA.padToAlignment(Align);
     }
 
     // Write description and padding.
     if (NE.Desc.binary_size() != 0) {
-      CBA.writeAsBinary(NE.Desc);
       CBA.padToAlignment(Align);
+      CBA.writeAsBinary(NE.Desc);
     }
+
+    CBA.padToAlignment(Align);
   }
 
   SHeader.sh_size = CBA.tell() - Offset;

llvm/test/tools/yaml2obj/ELF/note-section.yaml

@@ -355,24 +355,84 @@ Sections:
 ## specified section alignment
 
 # RUN: yaml2obj --docnum=17 %s -o - | \
-# RUN:   llvm-readobj --sections --section-data - | \
+# RUN:   llvm-readobj --sections --section-data --notes - | \
 # RUN:   FileCheck %s --check-prefix=TEST17
 
 # TEST17:      Name: .note.foo4
 # TEST17:      SectionData (
 # TEST17-NEXT:   0000: 05000000 02000000 01000000 41424344  |............ABCD|
-# TEST17-NEXT:   0010: 00000000 01020000 03000000 03000000  |................|
-# TEST17-NEXT:   0020: 02000000 41420000 03040500 03000000  |....AB..........|
-# TEST17-NEXT:   0030: 00000000 03000000 41420000           |........AB..|
+# TEST17-NEXT:   0010: 00000000 01020000 00000000 03000000  |................|
+# TEST17-NEXT:   0020: 02000000 03040500 04000000 00000000  |................|
+# TEST17-NEXT:   0030: 03000000 474E5500                    |....GNU.|
 # TEST17-NEXT: )
 # TEST17:      Name: .note.foo8
 # TEST17:      SectionData (
 # TEST17-NEXT:   0000: 05000000 02000000 01000000 41424344  |............ABCD|
 # TEST17-NEXT:   0010: 00000000 00000000 01020000 00000000  |................|
-# TEST17-NEXT:   0020: 03000000 03000000 02000000 41420000  |............AB..|
-# TEST17-NEXT:   0030: 03040500 00000000 03000000 00000000  |................|
-# TEST17-NEXT:   0040: 03000000 41420000                    |....AB..|
+# TEST17-NEXT:   0020: 00000000 03000000 02000000 00000000  |................|
+# TEST17-NEXT:   0030: 03040500 00000000 04000000 00000000  |................|
+# TEST17-NEXT:   0040: 03000000 474E5500                    |....GNU.|
 # TEST17-NEXT: )
+# TEST17:      NoteSections [
+# TEST17-NEXT:   NoteSection {
+# TEST17-NEXT:     Name: .note.foo4
+# TEST17-NEXT:     Offset:
+# TEST17-NEXT:     Size:
+# TEST17-NEXT:     Notes [
+# TEST17-NEXT:       {
+# TEST17-NEXT:         Owner: ABCD
+# TEST17-NEXT:         Data size: 0x2
+# TEST17-NEXT:         Type: NT_VERSION (version)
+# TEST17-NEXT:         Description data (
+# TEST17-NEXT:           0000: 0102                                 |..|
+# TEST17-NEXT:         )
+# TEST17-NEXT:       }
+# TEST17-NEXT:       {
+# TEST17-NEXT:         Owner: 
+# TEST17-NEXT:         Data size: 0x3
+# TEST17-NEXT:         Type: NT_ARCH (architecture)
+# TEST17-NEXT:         Description data (
+# TEST17-NEXT:           0000: 030405                               |...|
+# TEST17-NEXT:         )
+# TEST17-NEXT:       }
+# TEST17-NEXT:       {
+# TEST17-NEXT:         Owner: GNU
+# TEST17-NEXT:         Data size: 0x0
+# TEST17-NEXT:         Type: NT_GNU_BUILD_ID (unique build ID bitstring)
+# TEST17-NEXT:         Build ID: 
+# TEST17-NEXT:       }
+# TEST17-NEXT:     ]
+# TEST17-NEXT:   }
+# TEST17-NEXT:   NoteSection {
+# TEST17-NEXT:     Name: .note.foo8
+# TEST17-NEXT:     Offset:
+# TEST17-NEXT:     Size:
+# TEST17-NEXT:     Notes [
+# TEST17-NEXT:       {
+# TEST17-NEXT:         Owner: ABCD
+# TEST17-NEXT:         Data size: 0x2
+# TEST17-NEXT:         Type: NT_VERSION (version)
+# TEST17-NEXT:         Description data (
+# TEST17-NEXT:           0000: 0102                                 |..|
+# TEST17-NEXT:         )
+# TEST17-NEXT:       }
+# TEST17-NEXT:       {
+# TEST17-NEXT:         Owner: 
+# TEST17-NEXT:         Data size: 0x3
+# TEST17-NEXT:         Type: NT_ARCH (architecture)
+# TEST17-NEXT:         Description data (
+# TEST17-NEXT:           0000: 030405                               |...|
+# TEST17-NEXT:         )
+# TEST17-NEXT:       }
+# TEST17-NEXT:       {
+# TEST17-NEXT:         Owner: GNU
+# TEST17-NEXT:         Data size: 0x0
+# TEST17-NEXT:         Type: NT_GNU_BUILD_ID (unique build ID bitstring)
+# TEST17-NEXT:         Build ID: 
+# TEST17-NEXT:       }
+# TEST17-NEXT:     ]
+# TEST17-NEXT:   }
+# TEST17-NEXT: ]
 
 --- !ELF
 FileHeader:
@@ -385,22 +445,20 @@ Sections:
     AddressAlign: 4
     Notes:
       - Name: ABCD
-        Desc: 0102
         Type: NT_VERSION
-      - Name: AB
+        Desc: 0102
+      - Type: NT_ARCH
         Desc: 030405
-        Type: NT_ARCH
-      - Name: AB
+      - Name: GNU
         Type: NT_GNU_BUILD_ID
   - Name:        .note.foo8
     Type:         SHT_NOTE
     AddressAlign: 8
     Notes:
       - Name: ABCD
-        Desc: 0102
         Type: NT_VERSION
-      - Name: AB
+        Desc: 0102
+      - Type: NT_ARCH
         Desc: 030405
-        Type: NT_ARCH
-      - Name: AB
+      - Name: GNU
         Type: NT_GNU_BUILD_ID