[llvm] 9020026 - [JITLink][AArch32] Fix GetEdgeKindName function in error tests

[Stefan Gränitz via llvm-commits]

Author: Stefan Gränitz
Date: 2023-11-25T13:24:25+01:00
New Revision: 9020026b88b7f49d9d0e1780a89df4a2bce811e8

URL: https://github.com/llvm/llvm-project/commit/9020026b88b7f49d9d0e1780a89df4a2bce811e8
DIFF: https://github.com/llvm/llvm-project/commit/9020026b88b7f49d9d0e1780a89df4a2bce811e8.diff

LOG: [JITLink][AArch32] Fix GetEdgeKindName function in error tests

The `getGenericEdgeKindName()` function returned "<Unrecognized edge kind>" for all our relocations.
We must use `aarch32::getEdgeKindName()` instead.

Added: 
    

Modified: 
    llvm/unittests/ExecutionEngine/JITLink/AArch32ErrorTests.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/unittests/ExecutionEngine/JITLink/AArch32ErrorTests.cpp b/llvm/unittests/ExecutionEngine/JITLink/AArch32ErrorTests.cpp
index 9c4aeaf7ffa26ae..f46389136607ae0 100644
--- a/llvm/unittests/ExecutionEngine/JITLink/AArch32ErrorTests.cpp
+++ b/llvm/unittests/ExecutionEngine/JITLink/AArch32ErrorTests.cpp
@@ -20,7 +20,7 @@ using namespace llvm::support::endian;
 constexpr unsigned PointerSize = 4;
 auto G = std::make_unique<LinkGraph>("foo", Triple("armv7-linux-gnueabi"),
                                      PointerSize, endianness::little,
-                                     getGenericEdgeKindName);
+                                     aarch32::getEdgeKindName);
 auto &Sec =
     G->createSection("__data", orc::MemProt::Read | orc::MemProt::Write);
 
@@ -52,9 +52,10 @@ TEST(AArch32_ELF, readAddendArmErrors) {
                            "INVALID RELOCATION")));
 
   for (Edge::Kind K = FirstArmRelocation; K < LastArmRelocation; K += 1) {
-    EXPECT_THAT_EXPECTED(
-        readAddend(*G, BArm, SymbolOffset, K, ArmCfg),
-        FailedWithMessage(testing::StartsWith("Invalid opcode")));
+    EXPECT_THAT_EXPECTED(readAddend(*G, BArm, SymbolOffset, K, ArmCfg),
+                         FailedWithMessage(testing::AllOf(
+                             testing::StartsWith("Invalid opcode"),
+                             testing::EndsWith(aarch32::getEdgeKindName(K)))));
   }
 }
 
@@ -76,9 +77,10 @@ TEST(AArch32_ELF, readAddendThumbErrors) {
                                        ThumbAlignment, AlignmentOffset);
 
   for (Edge::Kind K = FirstThumbRelocation; K < LastThumbRelocation; K += 1) {
-    EXPECT_THAT_EXPECTED(
-        readAddend(*G, BThumb, SymbolOffset, K, ArmCfg),
-        FailedWithMessage(testing::StartsWith("Invalid opcode")));
+    EXPECT_THAT_EXPECTED(readAddend(*G, BThumb, SymbolOffset, K, ArmCfg),
+                         FailedWithMessage(testing::AllOf(
+                             testing::StartsWith("Invalid opcode"),
+                             testing::EndsWith(aarch32::getEdgeKindName(K)))));
   }
 }
 
@@ -108,7 +110,7 @@ TEST(AArch32_ELF, applyFixupArmErrors) {
     EXPECT_THAT_ERROR(applyFixup(*G, BArm, E, ArmCfg),
                       FailedWithMessage(testing::AllOf(
                           testing::StartsWith("Invalid opcode"),
-                          testing::EndsWith(G->getEdgeKindName(K)))));
+                          testing::EndsWith(aarch32::getEdgeKindName(K)))));
   }
 }
 
@@ -149,6 +151,6 @@ TEST(AArch32_ELF, applyFixupThumbErrors) {
     EXPECT_THAT_ERROR(applyFixup(*G, BThumb, E, ArmCfg),
                       FailedWithMessage(testing::AllOf(
                           testing::StartsWith("Invalid opcode"),
-                          testing::EndsWith(G->getEdgeKindName(K)))));
+                          testing::EndsWith(aarch32::getEdgeKindName(K)))));
   }
 }