[llvm] [ARM] Don't try to emit AEABI libcalls for non-AEABI targets (PR #207813)

Adam Nemet via llvm-commits llvm-commits at lists.llvm.org
Tue Jul 7 13:50:30 PDT 2026


https://github.com/anemet updated https://github.com/llvm/llvm-project/pull/207813

>From b34dee21201635e36a239e388d3ff07a6e52164c Mon Sep 17 00:00:00 2001
From: Adam Nemet <anemet at apple.com>
Date: Mon, 6 Jul 2026 11:52:10 -0700
Subject: [PATCH 1/2] [ARM] Don't try to emit AEABI libcalls for non-AEABI
 targets

PR #172672 added ARMTargetLowering::LowerAEABIUnalignedLoad/Store
which lowers some of the unaligned i32/i64 stores to
__aeabi_u{read,write}{4,8}. The libcall is emitted unconditionally,
with no check whether the target environment actually has these
AEABI helpers.

We don't have it for Apple/MachO which leads to a compiler crash.

rdar://175136625
---
 llvm/include/llvm/IR/RuntimeLibcalls.h        | 10 +--
 llvm/lib/Target/ARM/ARMISelLowering.cpp       |  9 +-
 .../ARM/unaligned_load_store_no_aeabi.ll      | 83 +++++++++++++++++++
 llvm/utils/UpdateTestChecks/asm.py            |  1 +
 4 files changed, 96 insertions(+), 7 deletions(-)
 create mode 100644 llvm/test/CodeGen/ARM/unaligned_load_store_no_aeabi.ll

diff --git a/llvm/include/llvm/IR/RuntimeLibcalls.h b/llvm/include/llvm/IR/RuntimeLibcalls.h
index f43e09ada394e..ee1458a0304b6 100644
--- a/llvm/include/llvm/IR/RuntimeLibcalls.h
+++ b/llvm/include/llvm/IR/RuntimeLibcalls.h
@@ -166,6 +166,11 @@ struct RuntimeLibcallsInfo {
   /// to be the last argument.
   LLVM_ABI static bool hasVectorMaskArgument(RTLIB::LibcallImpl Impl);
 
+  static bool hasAEABILibcalls(const Triple &TT) {
+    return TT.isTargetAEABI() || TT.isTargetGNUAEABI() ||
+           TT.isTargetMuslAEABI() || TT.isOSFuchsia() || TT.isAndroid();
+  }
+
 private:
   LLVM_ABI static iota_range<RTLIB::LibcallImpl>
   lookupLibcallImplNameImpl(StringRef Name);
@@ -220,11 +225,6 @@ struct RuntimeLibcallsInfo {
     return TT.isWatchOS();
   }
 
-  static bool hasAEABILibcalls(const Triple &TT) {
-    return TT.isTargetAEABI() || TT.isTargetGNUAEABI() ||
-           TT.isTargetMuslAEABI() || TT.isOSFuchsia() || TT.isAndroid();
-  }
-
   LLVM_READONLY
   static bool isAAPCS_ABI(const Triple &TT, StringRef ABIName);
 
diff --git a/llvm/lib/Target/ARM/ARMISelLowering.cpp b/llvm/lib/Target/ARM/ARMISelLowering.cpp
index 577e97e736c25..c9efc79fdc0d1 100644
--- a/llvm/lib/Target/ARM/ARMISelLowering.cpp
+++ b/llvm/lib/Target/ARM/ARMISelLowering.cpp
@@ -82,6 +82,7 @@
 #include "llvm/IR/Intrinsics.h"
 #include "llvm/IR/IntrinsicsARM.h"
 #include "llvm/IR/Module.h"
+#include "llvm/IR/RuntimeLibcalls.h"
 #include "llvm/IR/Type.h"
 #include "llvm/IR/User.h"
 #include "llvm/IR/Value.h"
@@ -9817,7 +9818,9 @@ ARMTargetLowering::LowerAEABIUnalignedLoad(SDValue Op,
   bool AllowsUnaligned = Subtarget->allowsUnalignedMem();
 
   if (MF.getFunction().hasMinSize() && !AllowsUnaligned &&
-      Alignment <= llvm::Align(2)) {
+      Alignment <= llvm::Align(2) &&
+      RTLIB::RuntimeLibcallsInfo::hasAEABILibcalls(
+          Subtarget->getTargetTriple())) {
 
     RTLIB::Libcall LC =
         (MemVT == MVT::i32) ? RTLIB::AEABI_UREAD4 : RTLIB::AEABI_UREAD8;
@@ -9862,7 +9865,9 @@ SDValue ARMTargetLowering::LowerAEABIUnalignedStore(SDValue Op,
   bool AllowsUnaligned = Subtarget->allowsUnalignedMem();
 
   if (MF.getFunction().hasMinSize() && !AllowsUnaligned &&
-      Alignment <= llvm::Align(2)) {
+      Alignment <= llvm::Align(2) &&
+      RTLIB::RuntimeLibcallsInfo::hasAEABILibcalls(
+          Subtarget->getTargetTriple())) {
 
     SDLoc dl(Op);
 
diff --git a/llvm/test/CodeGen/ARM/unaligned_load_store_no_aeabi.ll b/llvm/test/CodeGen/ARM/unaligned_load_store_no_aeabi.ll
new file mode 100644
index 0000000000000..828f07f4aa9aa
--- /dev/null
+++ b/llvm/test/CodeGen/ARM/unaligned_load_store_no_aeabi.ll
@@ -0,0 +1,83 @@
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
+; RUN: llc -mtriple=thumbv7em-apple-none-macho -mcpu=cortex-m4 -mattr=+strict-align,-fp64 -float-abi=hard < %s | FileCheck %s
+
+; The AEABI __aeabi_u{read,write}{4,8} helpers do not exist on non-AEABI
+; environments (Apple/MachO).
+
+define void @store4_align1_minsize(ptr %p, i32 %v) minsize {
+; CHECK-LABEL: store4_align1_minsize:
+; CHECK:       @ %bb.0:
+; CHECK-NEXT:    lsrs r2, r1, #24
+; CHECK-NEXT:    strb r1, [r0]
+; CHECK-NEXT:    strb r2, [r0, #3]
+; CHECK-NEXT:    lsrs r2, r1, #16
+; CHECK-NEXT:    lsrs r1, r1, #8
+; CHECK-NEXT:    strb r2, [r0, #2]
+; CHECK-NEXT:    strb r1, [r0, #1]
+; CHECK-NEXT:    bx lr
+  store i32 %v, ptr %p, align 1
+  ret void
+}
+
+define void @store8_align1_minsize(ptr %p, i64 %v) minsize {
+; CHECK-LABEL: store8_align1_minsize:
+; CHECK:       @ %bb.0:
+; CHECK-NEXT:    lsrs r1, r3, #24
+; CHECK-NEXT:    strb r3, [r0, #4]
+; CHECK-NEXT:    strb r2, [r0]
+; CHECK-NEXT:    strb r1, [r0, #7]
+; CHECK-NEXT:    lsrs r1, r3, #16
+; CHECK-NEXT:    strb r1, [r0, #6]
+; CHECK-NEXT:    lsrs r1, r3, #8
+; CHECK-NEXT:    strb r1, [r0, #5]
+; CHECK-NEXT:    lsrs r1, r2, #24
+; CHECK-NEXT:    strb r1, [r0, #3]
+; CHECK-NEXT:    lsrs r1, r2, #16
+; CHECK-NEXT:    strb r1, [r0, #2]
+; CHECK-NEXT:    lsrs r1, r2, #8
+; CHECK-NEXT:    strb r1, [r0, #1]
+; CHECK-NEXT:    bx lr
+  store i64 %v, ptr %p, align 1
+  ret void
+}
+
+define i32 @load4_align1_minsize(ptr %p) minsize {
+; CHECK-LABEL: load4_align1_minsize:
+; CHECK:       @ %bb.0:
+; CHECK-NEXT:    ldrb r1, [r0]
+; CHECK-NEXT:    ldrb r2, [r0, #1]
+; CHECK-NEXT:    ldrb r3, [r0, #2]
+; CHECK-NEXT:    ldrb r0, [r0, #3]
+; CHECK-NEXT:    orr.w r0, r3, r0, lsl #8
+; CHECK-NEXT:    orr.w r1, r1, r2, lsl #8
+; CHECK-NEXT:    orr.w r0, r1, r0, lsl #16
+; CHECK-NEXT:    bx lr
+  %v = load i32, ptr %p, align 1
+  ret i32 %v
+}
+
+define i64 @load8_align1_minsize(ptr %p) minsize {
+; CHECK-LABEL: load8_align1_minsize:
+; CHECK:       @ %bb.0:
+; CHECK-NEXT:    push {r4, lr}
+; CHECK-NEXT:    .cfi_def_cfa_offset 8
+; CHECK-NEXT:    .cfi_offset lr, -4
+; CHECK-NEXT:    .cfi_offset r4, -8
+; CHECK-NEXT:    ldrb r1, [r0, #7]
+; CHECK-NEXT:    ldrb r2, [r0, #6]
+; CHECK-NEXT:    ldrb r3, [r0, #4]
+; CHECK-NEXT:    ldrb r4, [r0, #2]
+; CHECK-NEXT:    orr.w r1, r2, r1, lsl #8
+; CHECK-NEXT:    ldrb r2, [r0, #5]
+; CHECK-NEXT:    orr.w r2, r3, r2, lsl #8
+; CHECK-NEXT:    ldrb r3, [r0, #1]
+; CHECK-NEXT:    orr.w r1, r2, r1, lsl #16
+; CHECK-NEXT:    ldrb r2, [r0]
+; CHECK-NEXT:    ldrb r0, [r0, #3]
+; CHECK-NEXT:    orr.w r0, r4, r0, lsl #8
+; CHECK-NEXT:    orr.w r2, r2, r3, lsl #8
+; CHECK-NEXT:    orr.w r0, r2, r0, lsl #16
+; CHECK-NEXT:    pop {r4, pc}
+  %v = load i64, ptr %p, align 1
+  ret i64 %v
+}
diff --git a/llvm/utils/UpdateTestChecks/asm.py b/llvm/utils/UpdateTestChecks/asm.py
index 5f441227092f4..226342024a0df 100644
--- a/llvm/utils/UpdateTestChecks/asm.py
+++ b/llvm/utils/UpdateTestChecks/asm.py
@@ -589,6 +589,7 @@ def get_run_handler(triple):
         "thumb": (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE),
         "thumb-macho": (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_MACHO_RE),
         "thumbv5-macho": (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_MACHO_RE),
+        "thumbv7em-apple-none-macho": (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_MACHO_RE),
         "thumbv7s-apple-darwin": (scrub_asm_arm_eabi, ASM_FUNCTION_THUMBS_DARWIN_RE),
         "thumbv7-apple-darwin": (scrub_asm_arm_eabi, ASM_FUNCTION_THUMB_DARWIN_RE),
         "thumbv7-apple-ios": (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_IOS_RE),

>From d99efd333b25269994d10fc99078f80a719b5b94 Mon Sep 17 00:00:00 2001
From: Adam Nemet <anemet at apple.com>
Date: Mon, 6 Jul 2026 14:21:19 -0700
Subject: [PATCH 2/2] Address review comment

---
 llvm/include/llvm/IR/RuntimeLibcalls.h  | 10 +++++-----
 llvm/lib/Target/ARM/ARMISelLowering.cpp | 20 ++++++--------------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/llvm/include/llvm/IR/RuntimeLibcalls.h b/llvm/include/llvm/IR/RuntimeLibcalls.h
index ee1458a0304b6..f43e09ada394e 100644
--- a/llvm/include/llvm/IR/RuntimeLibcalls.h
+++ b/llvm/include/llvm/IR/RuntimeLibcalls.h
@@ -166,11 +166,6 @@ struct RuntimeLibcallsInfo {
   /// to be the last argument.
   LLVM_ABI static bool hasVectorMaskArgument(RTLIB::LibcallImpl Impl);
 
-  static bool hasAEABILibcalls(const Triple &TT) {
-    return TT.isTargetAEABI() || TT.isTargetGNUAEABI() ||
-           TT.isTargetMuslAEABI() || TT.isOSFuchsia() || TT.isAndroid();
-  }
-
 private:
   LLVM_ABI static iota_range<RTLIB::LibcallImpl>
   lookupLibcallImplNameImpl(StringRef Name);
@@ -225,6 +220,11 @@ struct RuntimeLibcallsInfo {
     return TT.isWatchOS();
   }
 
+  static bool hasAEABILibcalls(const Triple &TT) {
+    return TT.isTargetAEABI() || TT.isTargetGNUAEABI() ||
+           TT.isTargetMuslAEABI() || TT.isOSFuchsia() || TT.isAndroid();
+  }
+
   LLVM_READONLY
   static bool isAAPCS_ABI(const Triple &TT, StringRef ABIName);
 
diff --git a/llvm/lib/Target/ARM/ARMISelLowering.cpp b/llvm/lib/Target/ARM/ARMISelLowering.cpp
index c9efc79fdc0d1..a1411145a684b 100644
--- a/llvm/lib/Target/ARM/ARMISelLowering.cpp
+++ b/llvm/lib/Target/ARM/ARMISelLowering.cpp
@@ -82,7 +82,6 @@
 #include "llvm/IR/Intrinsics.h"
 #include "llvm/IR/IntrinsicsARM.h"
 #include "llvm/IR/Module.h"
-#include "llvm/IR/RuntimeLibcalls.h"
 #include "llvm/IR/Type.h"
 #include "llvm/IR/User.h"
 #include "llvm/IR/Value.h"
@@ -9816,15 +9815,11 @@ ARMTargetLowering::LowerAEABIUnalignedLoad(SDValue Op,
   Align Alignment = LD->getAlign();
   const DataLayout &DL = DAG.getDataLayout();
   bool AllowsUnaligned = Subtarget->allowsUnalignedMem();
+  RTLIB::Libcall LC =
+      (MemVT == MVT::i32) ? RTLIB::AEABI_UREAD4 : RTLIB::AEABI_UREAD8;
 
   if (MF.getFunction().hasMinSize() && !AllowsUnaligned &&
-      Alignment <= llvm::Align(2) &&
-      RTLIB::RuntimeLibcallsInfo::hasAEABILibcalls(
-          Subtarget->getTargetTriple())) {
-
-    RTLIB::Libcall LC =
-        (MemVT == MVT::i32) ? RTLIB::AEABI_UREAD4 : RTLIB::AEABI_UREAD8;
-
+      Alignment <= llvm::Align(2) && DAG.getLibcalls().getLibcallImpl(LC)) {
     MakeLibCallOptions Opts;
     SDLoc dl(Op);
 
@@ -9863,11 +9858,11 @@ SDValue ARMTargetLowering::LowerAEABIUnalignedStore(SDValue Op,
   Align Alignment = ST->getAlign();
   const DataLayout &DL = DAG.getDataLayout();
   bool AllowsUnaligned = Subtarget->allowsUnalignedMem();
+  RTLIB::Libcall LC =
+      (MemVT == MVT::i32) ? RTLIB::AEABI_UWRITE4 : RTLIB::AEABI_UWRITE8;
 
   if (MF.getFunction().hasMinSize() && !AllowsUnaligned &&
-      Alignment <= llvm::Align(2) &&
-      RTLIB::RuntimeLibcallsInfo::hasAEABILibcalls(
-          Subtarget->getTargetTriple())) {
+      Alignment <= llvm::Align(2) && DAG.getLibcalls().getLibcallImpl(LC)) {
 
     SDLoc dl(Op);
 
@@ -9876,9 +9871,6 @@ SDValue ARMTargetLowering::LowerAEABIUnalignedStore(SDValue Op,
     if (ST->isTruncatingStore())
       StoreVal = DAG.getNode(ISD::TRUNCATE, dl, MemVT, ST->getOperand(1));
 
-    RTLIB::Libcall LC =
-        (MemVT == MVT::i32) ? RTLIB::AEABI_UWRITE4 : RTLIB::AEABI_UWRITE8;
-
     MakeLibCallOptions Opts;
     auto CallResult =
         makeLibCall(DAG, LC, MVT::isVoid, {StoreVal, ST->getBasePtr()}, Opts,



More information about the llvm-commits mailing list