Merged main:fa23d2b9d972 into amd-gfx:b5cf6611d3a0

Local branch amd-gfx b5cf661 Merged main:7c44167daa75 into amd-gfx:294af0383f6c
Remote branch main fa23d2b [JITLink][AArch32] Add test fixture with helper functions in error tests

Author: SC llvm team

llvm/include/llvm/Config/llvm-config.h.cmake

@@ -16,7 +16,7 @@
 
 /* Indicate that this is LLVM compiled from the amd-gfx branch. */
 #define LLVM_HAVE_BRANCH_AMD_GFX
-#define LLVM_MAIN_REVISION 481714
+#define LLVM_MAIN_REVISION 481715
 
 /* Define if LLVM_ENABLE_DUMP is enabled */
 #cmakedefine LLVM_ENABLE_DUMP

llvm/unittests/ExecutionEngine/JITLink/AArch32ErrorTests.cpp

@@ -26,26 +26,47 @@ auto &Sec =
 
 auto ArmCfg = getArmConfigForCPUArch(ARMBuildAttrs::v7);
 
-constexpr uint64_t DataAlignment = 4;
 constexpr uint64_t ArmAlignment = 4;
 constexpr uint64_t ThumbAlignment = 2;
 constexpr uint64_t AlignmentOffset = 0;
 
 constexpr orc::ExecutorAddrDiff SymbolOffset = 0;
 constexpr orc::ExecutorAddrDiff SymbolSize = 4;
 
-template <size_t sizeOfArray>
-ArrayRef<char> toArrayRefChar(const uint8_t (&Zeros)[sizeOfArray]) {
-  return ArrayRef<char>(reinterpret_cast<const char *>(&Zeros), sizeof(Zeros));
-}
+class AArch32Errors_ELF : public testing::Test {
+protected:
+  ArmConfig ArmCfg = getArmConfigForCPUArch(ARMBuildAttrs::v7);
+  std::unique_ptr<LinkGraph> G;
+  Section *S = nullptr;
+
+  const uint8_t Zeros[4]{0x00, 0x00, 0x00, 0x00};
+
+public:
+  static void SetUpTestCase() {}
+
+  void SetUp() override {
+    G = std::make_unique<LinkGraph>("foo", Triple("armv7-linux-gnueabi"),
+                                    PointerSize, endianness::little,
+                                    aarch32::getEdgeKindName);
+    S = &G->createSection("__data", orc::MemProt::Read | orc::MemProt::Write);
+  }
+
+  void TearDown() override {}
+
+protected:
+  template <size_t Size>
+  Block &createBlock(const uint8_t (&Content)[Size], uint64_t Addr,
+                     uint64_t Alignment = 4) {
+    ArrayRef<char> CharContent{reinterpret_cast<const char *>(&Content),
+                               sizeof(Content)};
+    return G->createContentBlock(*S, CharContent, orc::ExecutorAddr(Addr),
+                                 Alignment, AlignmentOffset);
+  }
+};
 
-TEST(AArch32_ELF, readAddendDataErrors) {
+TEST_F(AArch32Errors_ELF, readAddendDataErrors) {
+  Block &ZerosBlock = createBlock(Zeros, 0x1000);
   constexpr uint64_t ZerosOffset = 0;
-  const uint8_t Zeros[] = {0x00, 0x00, 0x00, 0x00};
-  constexpr orc::ExecutorAddr ZerosBlockAddr(0x0000);
-  auto &ZerosBlock =
-      G->createContentBlock(Sec, toArrayRefChar(Zeros), ZerosBlockAddr,
-                            DataAlignment, AlignmentOffset);
 
   // Invalid edge kind is the only error we can raise here right now.
   Edge::Kind Invalid = Edge::GenericEdgeKind::Invalid;