[𝘀𝗽𝗿] initial version

Created using spr 1.3.4

Author: boomanaiden154

llvm/lib/Object/ELF.cpp

@@ -747,13 +747,25 @@ decodeBBAddrMapImpl(const ELFFile<ELFT> &EF,
     assert(RelaSec &&
            "Can't read a SHT_LLVM_BB_ADDR_MAP section in a relocatable "
            "object file without providing a relocation section.");
-    Expected<typename ELFFile<ELFT>::Elf_Rela_Range> Relas = EF.relas(*RelaSec);
-    if (!Relas)
-      return createError("unable to read relocations for section " +
-                         describe(EF, Sec) + ": " +
-                         toString(Relas.takeError()));
-    for (typename ELFFile<ELFT>::Elf_Rela Rela : *Relas)
-      FunctionOffsetTranslations[Rela.r_offset] = Rela.r_addend;
+    if (RelaSec->sh_type == ELF::SHT_CREL) {
+      Expected<typename ELFFile<ELFT>::RelsOrRelas> Relas = EF.crels(*RelaSec);
+      if (!Relas)
+        return createError("unable to read CREL relocations for section " +
+                           describe(EF, Sec) + ": " +
+                           toString(Relas.takeError()));
+      for (typename ELFFile<ELFT>::Elf_Rela Rela : std::get<1>(*Relas)) {
+        FunctionOffsetTranslations[Rela.r_offset] = Rela.r_addend;
+      }
+    } else {
+      Expected<typename ELFFile<ELFT>::Elf_Rela_Range> Relas =
+          EF.relas(*RelaSec);
+      if (!Relas)
+        return createError("unable to read relocations for section " +
+                           describe(EF, Sec) + ": " +
+                           toString(Relas.takeError()));
+      for (typename ELFFile<ELFT>::Elf_Rela Rela : *Relas)
+        FunctionOffsetTranslations[Rela.r_offset] = Rela.r_addend;
+    }
   }
   auto GetAddressForRelocation =
       [&](unsigned RelocationOffsetInSection) -> Expected<unsigned> {
@@ -958,7 +970,8 @@ ELFFile<ELFT>::getSectionAndRelocations(
         continue;
     }
 
-    if (Sec.sh_type != ELF::SHT_RELA && Sec.sh_type != ELF::SHT_REL)
+    if (Sec.sh_type != ELF::SHT_RELA && Sec.sh_type != ELF::SHT_REL &&
+        Sec.sh_type != ELF::SHT_CREL)
       continue;
 
     Expected<const Elf_Shdr *> RelSecOrErr = this->getSection(Sec.sh_info);

llvm/test/tools/llvm-readobj/ELF/bb-addr-map-relocatable.test

@@ -1,7 +1,8 @@
 ## This test checks how we handle the --bb-addr-map option on relocatable
 ## object files.
 
-# RUN: yaml2obj %s -o %t1.o
+# RUN: yaml2obj -D RELOCATION_SECTION_NAME=.rela.llvm_bb_addr_map \
+# RUN:   -D RELOCATION_SECTION_TYPE=SHT_RELA %s -o %t1.o
 # RUN: llvm-readobj %t1.o --bb-addr-map | FileCheck %s
 
 # CHECK:      BBAddrMap [
@@ -77,8 +78,8 @@ Sections:
                AddressOffset:   0x0
                Size:            0x11
                Metadata:        0x8
-  - Name:  .rela.llvm_bb_addr_map
-    Type:  SHT_RELA
+  - Name:  [[RELOCATION_SECTION_NAME]]
+    Type:  [[RELOCATION_SECTION_TYPE]]
     Flags: [ SHF_INFO_LINK ]
     Link:  .symtab
     Info:  .llvm_bb_addr_map
@@ -228,3 +229,55 @@ Sections:
 # ET-DYN-NO-WARNING:     ]
 # ET-DYN-NO-WARNING:   }
 # ET-DYN-NO-WARNING: ]
+
+## Check that we can correctly decode a BBAddrMap in a reloctable object file
+## with CREL relocations.
+
+# RUN: yaml2obj -D RELOCATION_SECTION_NAME=.crel.llvm_bb_addr_map \
+# RUN:   -D RELOCATION_SECTION_TYPE=SHT_CREL %s -o %t6.o
+# RUN: llvm-readobj %t6.o --bb-addr-map | FileCheck %s --check-prefix=CREL
+
+# CREL:      BBAddrMap [
+# CREL-NEXT:   Function {
+# CREL-NEXT:     At: 0x0
+# CREL-NEXT:     Name: <?>
+# CREL-NEXT:     BB Ranges [
+# CREL-NEXT:       {
+# CREL-NEXT:         Base Address: 0x0
+# CREL-NEXT:         BB Entries [
+# CREL-NEXT:           {
+# CREL-NEXT:             ID: 0
+# CREL-NEXT:             Offset: 0x0
+# CREL-NEXT:             Size: 0xF
+# CREL-NEXT:             HasReturn: Yes
+# CREL-NEXT:             HasTailCall: No
+# CREL-NEXT:             IsEHPad: No
+# CREL-NEXT:             CanFallThrough: No
+# CREL-NEXT:             HasIndirectBranch: No
+# CREL-NEXT:           }
+# CREL-NEXT:         ]
+# CREL-NEXT:       }
+# CREL-NEXT:     ]
+# CREL-NEXT:   }
+# CREL-NEXT:   Function {
+# CREL-NEXT:     At: 0x10
+# CREL-NEXT:     Name: <?>
+# CREL-NEXT:     BB Ranges [
+# CREL-NEXT:       {
+# CREL-NEXT:         Base Address: 0x10
+# CREL-NEXT:         BB Entries [
+# CREL-NEXT:           {
+# CREL-NEXT:             ID: 0
+# CREL-NEXT:             Offset: 0x0
+# CREL-NEXT:             Size: 0x11
+# CREL-NEXT:             HasReturn: No
+# CREL-NEXT:             HasTailCall: No
+# CREL-NEXT:             IsEHPad: No
+# CREL-NEXT:             CanFallThrough: Yes
+# CREL-NEXT:             HasIndirectBranch: No
+# CREL-NEXT:           }
+# CREL-NEXT:         ]
+# CREL-NEXT:       }
+# CREL-NEXT:     ]
+# CREL-NEXT:   }
+# CREL-NEXT: ]

llvm/tools/llvm-readobj/ELFDumper.cpp

@@ -6833,6 +6833,16 @@ void ELFDumper<ELFT>::printRelocatableStackSizes(
       continue;
     }
 
+    // We might end up with relocations in CREL here. If we do, report a
+    // warning since we do not currently support them.
+    if (RelocSec->sh_type == ELF::SHT_CREL) {
+      reportWarning(createError(".stack_sizes (" + describe(*StackSizesELFSec) +
+                                ") has a corresponding CREL relocation "
+                                "section, which is not currently supported."),
+                    FileName);
+      continue;
+    }
+
     // A .stack_sizes section header's sh_link field is supposed to point
     // to the section that contains the functions whose stack sizes are
     // described in it.

llvm/unittests/Object/ELFObjectFileTest.cpp

@@ -8,6 +8,7 @@
 
 #include "llvm/Object/ELFObjectFile.h"
 #include "llvm/ADT/STLExtras.h"
+#include "llvm/BinaryFormat/ELF.h"
 #include "llvm/ObjectYAML/yaml2obj.h"
 #include "llvm/Support/BlockFrequency.h"
 #include "llvm/Support/MemoryBuffer.h"
@@ -1433,7 +1434,8 @@ TEST(ELFObjectFileTest, GetSectionAndRelocations) {
     // Basic verification to make sure we have the correct section types.
     for (auto const &[Sec, RelaSec] : *SecToRelocMapOrErr) {
       ASSERT_EQ(Sec->sh_type, ELF::SHT_PROGBITS);
-      ASSERT_EQ(RelaSec->sh_type, ELF::SHT_RELA);
+      ASSERT_TRUE(RelaSec->sh_type == ELF::SHT_RELA ||
+                  RelaSec->sh_type == ELF::SHT_CREL);
     }
   };
 
@@ -1503,6 +1505,19 @@ TEST(ELFObjectFileTest, GetSectionAndRelocations) {
   DoCheckFails(MissingRelocatableContent, DefaultMatcher,
                "SHT_RELA section with index 1: failed to get a "
                "relocated section: invalid section index: 255");
+
+  StringRef OneTextSectionCREL = R"(
+Sections:
+  - Name: .text
+    Type: SHT_PROGBITS
+    Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
+  - Name: .crel.tex
+    Type: SHT_CREL
+    Flags: [ SHF_INFO_LINK ]
+    Info: .text
+)";
+
+  DoCheckSucceeds(OneTextSectionCREL, DefaultMatcher);
 }
 
 TEST(ELFObjectFileTest, ELFSymbolRefLess) {