set entry size

Created using spr 1.3.6-beta.1
llvm · Feb 15, 2025 · 3703e53 · 3703e53
1 parent 970042e
commit 3703e53
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/llvm/lib/ObjectYAML/ELFEmitter.cpp b/llvm/lib/ObjectYAML/ELFEmitter.cpp
@@ -1550,18 +1550,22 @@ void ELFState<ELFT>::writeSectionContent(Elf_Shdr &SHeader,
     return;
 
   for (const auto &[Idx, E] : llvm::enumerate(*Section.Entries)) {
+    unsigned Size = 0;
     if (Section.Type == llvm::ELF::SHT_LLVM_FUNC_MAP) {
       if (E.Version > 1)
         WithColor::warning() << "unsupported SHT_LLVM_FUNC_MAP version: "
                              << static_cast<int>(E.Version)
                              << "; encoding using the most recent version";
       CBA.write(E.Version);
-      SHeader.sh_size += 1;
+      Size += 1;
     }
     CBA.write<uintX_t>(E.Address, ELFT::Endianness);
-    SHeader.sh_size += sizeof(uintX_t);
+    Size += sizeof(uintX_t);
     CBA.write<uint64_t>(E.DynamicInstCount, ELFT::Endianness);
-    SHeader.sh_size += 8;
+    Size += 8;
+
+    SHeader.sh_size += Size;
+    SHeader.sh_entsize = Size;
   }
 }
 

diff --git a/llvm/test/tools/obj2yaml/ELF/func-map.yaml b/llvm/test/tools/obj2yaml/ELF/func-map.yaml
@@ -13,6 +13,7 @@
 # VALID-NEXT: Sections:
 # VALID-NEXT:   - Name: .llvm_func_map
 # VALID-NEXT:     Type: SHT_LLVM_FUNC_MAP
+# VALID-NEXT:     EntSize: 0x11
 # VALID-NEXT:     Entries:
 # VALID-NEXT:       - Version:         1
 ## The 'Address' field is omitted when it's zero.
@@ -82,12 +83,14 @@ Sections:
 # MULTI-NEXT: Sections:
 # MULTI-NEXT:   - Name: .llvm_func_map
 # MULTI-NEXT:     Type: SHT_LLVM_FUNC_MAP
+# MULTI-NEXT:     EntSize: 0x11
 # MULTI-NEXT:     Entries:
 # MULTI-NEXT:       - Version: 1
 # MULTI-NEXT:         Address: 0x2
 # MULTI-NEXT:         DynInstCnt: 3
 # MULTI-NEXT:   - Name: '.llvm_func_map (1)'
 # MULTI-NEXT:     Type: SHT_LLVM_FUNC_MAP
+# MULTI-NEXT:     EntSize: 0x11
 # MULTI-NEXT:     Entries:
 # MULTI-NEXT:       - Version: 1
 # MULTI-NEXT:         Address: 0xA
@@ -127,4 +130,5 @@ Sections:
 # INVALID-NEXT:      Sections:
 # INVALID-NEXT:        - Name:    .llvm_func_map
 # INVALID-NEXT:          Type:    SHT_LLVM_FUNC_MAP
+# INVALID-NEXT:          EntSize: 0x11
 # TRUNCATED-NEXT:        Content: '{{([[:xdigit:]]{16})}}'{{$}}