[llvm-branch-commits] [llvm] RuntimeLibcalls: Mark runtime helper functions nounwind (PR #244641)

Matt Arsenault via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Fri Nov 20 11:46:08 PST 2026


https://github.com/arsenm updated https://github.com/llvm/llvm-project/pull/244641

>From 33aae3694938bdb687d6134fd1cd06eb6edf4e92 Mon Sep 17 00:00:00 2001
From: Matt Arsenault <Matthew.Arsenault at amd.com>
Date: Sat, 14 Nov 2026 11:51:07 -0800
Subject: [PATCH] RuntimeLibcalls: Mark runtime helper functions nounwind

Co-authored-by: Claude Opus 5.5 <noreply at anthropic.com>
---
 llvm/include/llvm/IR/RuntimeLibcalls.td       | 51 ++++++-----
 .../Util/DeclareRuntimeLibcalls/aarch64.ll    | 89 ++++++++++---------
 .../Util/DeclareRuntimeLibcalls/arm.ll        |  5 +-
 .../Util/DeclareRuntimeLibcalls/arm64ec.ll    |  3 +-
 .../Util/DeclareRuntimeLibcalls/mips.ll       |  9 +-
 .../Util/DeclareRuntimeLibcalls/ve.ll         |  5 +-
 .../Util/DeclareRuntimeLibcalls/windows.ll    |  3 +-
 7 files changed, 90 insertions(+), 75 deletions(-)

diff --git a/llvm/include/llvm/IR/RuntimeLibcalls.td b/llvm/include/llvm/IR/RuntimeLibcalls.td
index bba2615015f6f..dc12c86d790c1 100644
--- a/llvm/include/llvm/IR/RuntimeLibcalls.td
+++ b/llvm/include/llvm/IR/RuntimeLibcalls.td
@@ -235,6 +235,11 @@ class PureLibcall<FuncArgType RetType, list<FuncArgType> ArgTypes>
   let Memory = NoMemory;
 }
 
+class NoUnwindLibcall<FuncArgType RetType, list<FuncArgType> ArgTypes = []>
+    : RuntimeLibcall<RetType, ArgTypes> {
+  let FnAttrs = [NoUnwind];
+}
+
 // Integer
 foreach IntTy = [TypeSuffix<"I16", Int16>, TypeSuffix<"I32", Int32>,
                  TypeSuffix<"I64", Int64>, TypeSuffix<"I128", Int128>] in {
@@ -879,8 +884,8 @@ def UNWIND_RESUME : RuntimeLibcall<Void, [Ptr]> {
 }
 
 def UNWIND_RAISE_EXCEPTION : RuntimeLibcall<Int, [Ptr]>;
-def UNWIND_REGISTER : RuntimeLibcall<Void, [Ptr]>;
-def UNWIND_UNREGISTER : RuntimeLibcall<Void, [Ptr]>;
+def UNWIND_REGISTER : NoUnwindLibcall<Void, [Ptr]>;
+def UNWIND_UNREGISTER : NoUnwindLibcall<Void, [Ptr]>;
 def UNWIND_GET_WASM_LPAD_CONTEXT : RuntimeLibcall<Ptr, []> {
   let FnAttrs = [NoUnwind];
 }
@@ -1030,24 +1035,24 @@ def STACK_SMASH_HANDLER : RuntimeLibcall<Void, [Ptr]> {
 }
 
 // Safe stack
-def SAFESTACK_POINTER_ADDRESS : RuntimeLibcall<Ptr, []>;
+def SAFESTACK_POINTER_ADDRESS : NoUnwindLibcall<Ptr>;
 
 // Really a global variable, not a function
 def SAFESTACK_UNSAFE_STACK_PTR
     : RuntimeLibcallVariable<AllocaPtr, /*threadLocal=*/true>;
 
 def STACK_PROBE : RuntimeLibcall<Void, []>;
-def SECURITY_CHECK_COOKIE : RuntimeLibcall<Void, [Ptr]>;
+def SECURITY_CHECK_COOKIE : NoUnwindLibcall<Void, [Ptr]>;
 
 // Deoptimization
 def DEOPTIMIZE : RuntimeLibcall<Void, [Ellip]>;
 
 // Return address
-def RETURN_ADDRESS : RuntimeLibcall<Ptr, [Int]>;
+def RETURN_ADDRESS : NoUnwindLibcall<Ptr, [Int]>;
 
 // GPU profiling
-def PROFILE_INSTRUMENT_GPU : RuntimeLibcall<Void, [Ptr, Ptr, UInt64]>;
-def PROFILE_SAMPLING_GPU : RuntimeLibcall<Int, [UInt32]>;
+def PROFILE_INSTRUMENT_GPU : NoUnwindLibcall<Void, [Ptr, Ptr, UInt64]>;
+def PROFILE_SAMPLING_GPU : NoUnwindLibcall<Int, [UInt32]>;
 
 // Clear cache
 def CLEAR_CACHE : RuntimeLibcall<Void, [Ptr, Ptr]>;
@@ -1057,10 +1062,10 @@ def RISCV_FLUSH_ICACHE : RuntimeLibcall<Int, [Ptr, Ptr, ULong]>;
 def ComplexF32 : StructFuncArgType<[Flt, Flt]>;
 def ComplexF64 : StructFuncArgType<[Dbl, Dbl]>;
 
-def MIPS16_RET_DC : RuntimeLibcall<Void, [ComplexF64]>;
-def MIPS16_RET_DF : RuntimeLibcall<Void, [Dbl]>;
-def MIPS16_RET_SC : RuntimeLibcall<Void, [ComplexF32]>;
-def MIPS16_RET_SF : RuntimeLibcall<Void, [Flt]>;
+def MIPS16_RET_DC : NoUnwindLibcall<Void, [ComplexF64]>;
+def MIPS16_RET_DF : NoUnwindLibcall<Void, [Dbl]>;
+def MIPS16_RET_SC : NoUnwindLibcall<Void, [ComplexF32]>;
+def MIPS16_RET_SF : NoUnwindLibcall<Void, [Flt]>;
 
 // Produce libcall impls for all float types. If provided, `rtbasename` should
 // contain a `<typesuffix>` that will be replaced with the `f`/`l`/`fX` suffix.
@@ -1090,14 +1095,14 @@ def SC_MEMCHR : RuntimeLibcall<Ptr, [Ptr, Int, SizeT]> {
 
 // AArch64 SME ABI calls
 def SMEState : StructFuncArgType<[UInt64, UInt64]>;
-def SMEABI_SME_STATE : RuntimeLibcall<SMEState, []>;
-def SMEABI_TPIDR2_SAVE : RuntimeLibcall<Void, []>;
-def SMEABI_ZA_DISABLE : RuntimeLibcall<Void, []>;
-def SMEABI_TPIDR2_RESTORE : RuntimeLibcall<Void, [Ptr]>;
-def SMEABI_GET_CURRENT_VG : RuntimeLibcall<UInt64, []>;
-def SMEABI_SME_STATE_SIZE : RuntimeLibcall<UInt64, []>;
-def SMEABI_SME_SAVE : RuntimeLibcall<Void, [Ptr]>;
-def SMEABI_SME_RESTORE : RuntimeLibcall<Void, [Ptr]>;
+def SMEABI_SME_STATE : NoUnwindLibcall<SMEState>;
+def SMEABI_TPIDR2_SAVE : NoUnwindLibcall<Void>;
+def SMEABI_ZA_DISABLE : NoUnwindLibcall<Void>;
+def SMEABI_TPIDR2_RESTORE : NoUnwindLibcall<Void, [Ptr]>;
+def SMEABI_GET_CURRENT_VG : NoUnwindLibcall<UInt64>;
+def SMEABI_SME_STATE_SIZE : NoUnwindLibcall<UInt64>;
+def SMEABI_SME_SAVE : NoUnwindLibcall<Void, [Ptr]>;
+def SMEABI_SME_RESTORE : NoUnwindLibcall<Void, [Ptr]>;
 
 // ARM EABI calls
 // The AEABI memory functions (RTABI section 5.3.4) return void, and
@@ -1267,10 +1272,10 @@ def CTERMID : RuntimeLibcall<Ptr, [Ptr]> {
   let ParamAttrs = [[CapturesNone, NoUndef]];
 }
 
-def CXA_ATEXIT : RuntimeLibcall<Int, [Ptr, Ptr, Ptr]>;
-def CXA_GUARD_ABORT : RuntimeLibcall<Void, [Ptr]>;
-def CXA_GUARD_ACQUIRE : RuntimeLibcall<Int, [Ptr]>;
-def CXA_GUARD_RELEASE : RuntimeLibcall<Void, [Ptr]>;
+def CXA_ATEXIT : NoUnwindLibcall<Int, [Ptr, Ptr, Ptr]>;
+def CXA_GUARD_ABORT : NoUnwindLibcall<Void, [Ptr]>;
+def CXA_GUARD_ACQUIRE : NoUnwindLibcall<Int, [Ptr]>;
+def CXA_GUARD_RELEASE : NoUnwindLibcall<Void, [Ptr]>;
 def CXA_THROW : RuntimeLibcall<Void, [Ptr, Ptr, Ptr]> {
   let FnAttrs = [Cold, NoReturn];
 }
diff --git a/llvm/test/Transforms/Util/DeclareRuntimeLibcalls/aarch64.ll b/llvm/test/Transforms/Util/DeclareRuntimeLibcalls/aarch64.ll
index 7c16e542124cb..66887c6b751ac 100644
--- a/llvm/test/Transforms/Util/DeclareRuntimeLibcalls/aarch64.ll
+++ b/llvm/test/Transforms/Util/DeclareRuntimeLibcalls/aarch64.ll
@@ -115,18 +115,18 @@
 ; LINUX-NEXT: declare double @__adddf3(double, double) [[NOMEM_ATTRS:#[0-9]+]]
 ; LINUX-NEXT: declare float @__addsf3(float, float) [[NOMEM_ATTRS]]
 ; LINUX-NEXT: declare fp128 @__addtf3(fp128, fp128) [[NOMEM_ATTRS]]
-; LINUX-NEXT: declare aarch64_sme_preservemost_from_x1 i64 @__arm_get_current_vg()
+; LINUX-NEXT: declare aarch64_sme_preservemost_from_x1 i64 @__arm_get_current_vg() [[NOUNWIND_ATTRS:#[0-9]+]]
 ; LINUX-NEXT: declare ptr @__arm_sc_memchr(ptr readonly, i32, i64) [[ARGMEM_READ_ATTRS:#[0-9]+]]
 ; LINUX-NEXT: declare ptr @__arm_sc_memcpy(ptr, ptr, i64)
 ; LINUX-NEXT: declare ptr @__arm_sc_memmove(ptr, ptr, i64)
 ; LINUX-NEXT: declare ptr @__arm_sc_memset(ptr, i32, i64)
-; LINUX-NEXT: declare aarch64_sme_preservemost_from_x1 void @__arm_sme_restore(ptr)
-; LINUX-NEXT: declare aarch64_sme_preservemost_from_x1 void @__arm_sme_save(ptr)
-; LINUX-NEXT: declare aarch64_sme_preservemost_from_x2 { i64, i64 } @__arm_sme_state()
-; LINUX-NEXT: declare aarch64_sme_preservemost_from_x1 i64 @__arm_sme_state_size()
-; LINUX-NEXT: declare aarch64_sme_preservemost_from_x0 void @__arm_tpidr2_restore(ptr)
-; LINUX-NEXT: declare aarch64_sme_preservemost_from_x0 void @__arm_tpidr2_save()
-; LINUX-NEXT: declare aarch64_sme_preservemost_from_x0 void @__arm_za_disable()
+; LINUX-NEXT: declare aarch64_sme_preservemost_from_x1 void @__arm_sme_restore(ptr) [[NOUNWIND_ATTRS]]
+; LINUX-NEXT: declare aarch64_sme_preservemost_from_x1 void @__arm_sme_save(ptr) [[NOUNWIND_ATTRS]]
+; LINUX-NEXT: declare aarch64_sme_preservemost_from_x2 { i64, i64 } @__arm_sme_state() [[NOUNWIND_ATTRS]]
+; LINUX-NEXT: declare aarch64_sme_preservemost_from_x1 i64 @__arm_sme_state_size() [[NOUNWIND_ATTRS]]
+; LINUX-NEXT: declare aarch64_sme_preservemost_from_x0 void @__arm_tpidr2_restore(ptr) [[NOUNWIND_ATTRS]]
+; LINUX-NEXT: declare aarch64_sme_preservemost_from_x0 void @__arm_tpidr2_save() [[NOUNWIND_ATTRS]]
+; LINUX-NEXT: declare aarch64_sme_preservemost_from_x0 void @__arm_za_disable() [[NOUNWIND_ATTRS]]
 ; LINUX-NEXT: declare i64 @__ashldi3(i64, i32) [[NOMEM_ATTRS]]
 ; LINUX-NEXT: declare signext i16 @__ashlhi3(i16 signext, i32) [[NOMEM_ATTRS]]
 ; LINUX-NEXT: declare i32 @__ashlsi3(i32, i32) [[NOMEM_ATTRS]]
@@ -598,6 +598,7 @@
 ; LINUX-NEXT: attributes [[NORETURN_ONLY_ATTRS]] = { noreturn }
 ; LINUX-NEXT: attributes [[ATOMIC_ATTRS]] = { nocallback nofree nounwind willreturn }
 ; LINUX-NEXT: attributes [[NOMEM_ATTRS]] = { nocallback nofree nosync nounwind willreturn memory(none) }
+; LINUX-NEXT: attributes [[NOUNWIND_ATTRS]] = { nounwind }
 ; LINUX-NEXT: attributes [[ARGMEM_READ_ATTRS]] = { nocallback nofree nosync nounwind willreturn memory(argmem: read) }
 ; LINUX-NEXT: attributes [[ERRNO_ATTRS]] = { nocallback nofree nosync nounwind willreturn memory(errnomem: write) }
 ; LINUX-NEXT: attributes [[ARGMEM_ATTRS]] = { nocallback nofree nosync nounwind willreturn memory(argmem: readwrite) }
@@ -717,18 +718,18 @@
 ; DARWIN-NEXT: declare double @__adddf3(double, double) [[NOMEM_ATTRS:#[0-9]+]]
 ; DARWIN-NEXT: declare float @__addsf3(float, float) [[NOMEM_ATTRS]]
 ; DARWIN-NEXT: declare fp128 @__addtf3(fp128, fp128) [[NOMEM_ATTRS]]
-; DARWIN-NEXT: declare aarch64_sme_preservemost_from_x1 i64 @__arm_get_current_vg()
+; DARWIN-NEXT: declare aarch64_sme_preservemost_from_x1 i64 @__arm_get_current_vg() [[NOUNWIND_ATTRS:#[0-9]+]]
 ; DARWIN-NEXT: declare ptr @__arm_sc_memchr(ptr readonly, i32, i64) [[ARGMEM_READ_ATTRS:#[0-9]+]]
 ; DARWIN-NEXT: declare ptr @__arm_sc_memcpy(ptr, ptr, i64)
 ; DARWIN-NEXT: declare ptr @__arm_sc_memmove(ptr, ptr, i64)
 ; DARWIN-NEXT: declare ptr @__arm_sc_memset(ptr, i32, i64)
-; DARWIN-NEXT: declare aarch64_sme_preservemost_from_x1 void @__arm_sme_restore(ptr)
-; DARWIN-NEXT: declare aarch64_sme_preservemost_from_x1 void @__arm_sme_save(ptr)
-; DARWIN-NEXT: declare aarch64_sme_preservemost_from_x2 { i64, i64 } @__arm_sme_state()
-; DARWIN-NEXT: declare aarch64_sme_preservemost_from_x1 i64 @__arm_sme_state_size()
-; DARWIN-NEXT: declare aarch64_sme_preservemost_from_x0 void @__arm_tpidr2_restore(ptr)
-; DARWIN-NEXT: declare aarch64_sme_preservemost_from_x0 void @__arm_tpidr2_save()
-; DARWIN-NEXT: declare aarch64_sme_preservemost_from_x0 void @__arm_za_disable()
+; DARWIN-NEXT: declare aarch64_sme_preservemost_from_x1 void @__arm_sme_restore(ptr) [[NOUNWIND_ATTRS]]
+; DARWIN-NEXT: declare aarch64_sme_preservemost_from_x1 void @__arm_sme_save(ptr) [[NOUNWIND_ATTRS]]
+; DARWIN-NEXT: declare aarch64_sme_preservemost_from_x2 { i64, i64 } @__arm_sme_state() [[NOUNWIND_ATTRS]]
+; DARWIN-NEXT: declare aarch64_sme_preservemost_from_x1 i64 @__arm_sme_state_size() [[NOUNWIND_ATTRS]]
+; DARWIN-NEXT: declare aarch64_sme_preservemost_from_x0 void @__arm_tpidr2_restore(ptr) [[NOUNWIND_ATTRS]]
+; DARWIN-NEXT: declare aarch64_sme_preservemost_from_x0 void @__arm_tpidr2_save() [[NOUNWIND_ATTRS]]
+; DARWIN-NEXT: declare aarch64_sme_preservemost_from_x0 void @__arm_za_disable() [[NOUNWIND_ATTRS]]
 ; DARWIN-NEXT: declare i64 @__ashldi3(i64, i32) [[NOMEM_ATTRS]]
 ; DARWIN-NEXT: declare signext i16 @__ashlhi3(i16 signext, i32) [[NOMEM_ATTRS]]
 ; DARWIN-NEXT: declare i32 @__ashlsi3(i32, i32) [[NOMEM_ATTRS]]
@@ -1143,6 +1144,7 @@
 ; DARWIN-NEXT: attributes [[NORETURN_ONLY_ATTRS]] = { noreturn }
 ; DARWIN-NEXT: attributes [[ATOMIC_ATTRS]] = { nocallback nofree nounwind willreturn }
 ; DARWIN-NEXT: attributes [[NOMEM_ATTRS]] = { nocallback nofree nosync nounwind willreturn memory(none) }
+; DARWIN-NEXT: attributes [[NOUNWIND_ATTRS]] = { nounwind }
 ; DARWIN-NEXT: attributes [[ARGMEM_READ_ATTRS]] = { nocallback nofree nosync nounwind willreturn memory(argmem: read) }
 ; DARWIN-NEXT: attributes [[ERRNO_ATTRS]] = { nocallback nofree nosync nounwind willreturn memory(errnomem: write) }
 ; DARWIN-NEXT: attributes [[ARGMEM_ATTRS]] = { nocallback nofree nosync nounwind willreturn memory(argmem: readwrite) }
@@ -1263,18 +1265,18 @@
 ; WINMSVC-NEXT: declare double @__adddf3(double, double) [[NOMEM_ATTRS:#[0-9]+]]
 ; WINMSVC-NEXT: declare float @__addsf3(float, float) [[NOMEM_ATTRS]]
 ; WINMSVC-NEXT: declare fp128 @__addtf3(fp128, fp128) [[NOMEM_ATTRS]]
-; WINMSVC-NEXT: declare aarch64_sme_preservemost_from_x1 i64 @__arm_get_current_vg()
+; WINMSVC-NEXT: declare aarch64_sme_preservemost_from_x1 i64 @__arm_get_current_vg() [[NOUNWIND_ATTRS:#[0-9]+]]
 ; WINMSVC-NEXT: declare ptr @__arm_sc_memchr(ptr readonly, i32, i64) [[ARGMEM_READ_ATTRS:#[0-9]+]]
 ; WINMSVC-NEXT: declare ptr @__arm_sc_memcpy(ptr, ptr, i64)
 ; WINMSVC-NEXT: declare ptr @__arm_sc_memmove(ptr, ptr, i64)
 ; WINMSVC-NEXT: declare ptr @__arm_sc_memset(ptr, i32, i64)
-; WINMSVC-NEXT: declare aarch64_sme_preservemost_from_x1 void @__arm_sme_restore(ptr)
-; WINMSVC-NEXT: declare aarch64_sme_preservemost_from_x1 void @__arm_sme_save(ptr)
-; WINMSVC-NEXT: declare aarch64_sme_preservemost_from_x2 { i64, i64 } @__arm_sme_state()
-; WINMSVC-NEXT: declare aarch64_sme_preservemost_from_x1 i64 @__arm_sme_state_size()
-; WINMSVC-NEXT: declare aarch64_sme_preservemost_from_x0 void @__arm_tpidr2_restore(ptr)
-; WINMSVC-NEXT: declare aarch64_sme_preservemost_from_x0 void @__arm_tpidr2_save()
-; WINMSVC-NEXT: declare aarch64_sme_preservemost_from_x0 void @__arm_za_disable()
+; WINMSVC-NEXT: declare aarch64_sme_preservemost_from_x1 void @__arm_sme_restore(ptr) [[NOUNWIND_ATTRS]]
+; WINMSVC-NEXT: declare aarch64_sme_preservemost_from_x1 void @__arm_sme_save(ptr) [[NOUNWIND_ATTRS]]
+; WINMSVC-NEXT: declare aarch64_sme_preservemost_from_x2 { i64, i64 } @__arm_sme_state() [[NOUNWIND_ATTRS]]
+; WINMSVC-NEXT: declare aarch64_sme_preservemost_from_x1 i64 @__arm_sme_state_size() [[NOUNWIND_ATTRS]]
+; WINMSVC-NEXT: declare aarch64_sme_preservemost_from_x0 void @__arm_tpidr2_restore(ptr) [[NOUNWIND_ATTRS]]
+; WINMSVC-NEXT: declare aarch64_sme_preservemost_from_x0 void @__arm_tpidr2_save() [[NOUNWIND_ATTRS]]
+; WINMSVC-NEXT: declare aarch64_sme_preservemost_from_x0 void @__arm_za_disable() [[NOUNWIND_ATTRS]]
 ; WINMSVC-NEXT: declare i64 @__ashldi3(i64, i32) [[NOMEM_ATTRS]]
 ; WINMSVC-NEXT: declare signext i16 @__ashlhi3(i16 signext, i32) [[NOMEM_ATTRS]]
 ; WINMSVC-NEXT: declare i32 @__ashlsi3(i32, i32) [[NOMEM_ATTRS]]
@@ -1484,7 +1486,7 @@
 ; WINMSVC-NEXT: declare double @__pow_finite(double, double) [[ERRNO_ATTRS]]
 ; WINMSVC-NEXT: declare float @__powf_finite(float, float) [[ERRNO_ATTRS]]
 ; WINMSVC-NEXT: declare fp128 @__powitf2(fp128, i32) [[NOMEM_ATTRS]]
-; WINMSVC-NEXT: declare void @__security_check_cookie(ptr)
+; WINMSVC-NEXT: declare void @__security_check_cookie(ptr) [[NOUNWIND_ATTRS]]
 ; WINMSVC-NEXT: declare double @__subdf3(double, double) [[NOMEM_ATTRS]]
 ; WINMSVC-NEXT: declare float @__subsf3(float, float) [[NOMEM_ATTRS]]
 ; WINMSVC-NEXT: declare fp128 @__subtf3(fp128, fp128) [[NOMEM_ATTRS]]
@@ -1683,6 +1685,7 @@
 ; WINMSVC-NEXT: attributes [[NORETURN_ONLY_ATTRS]] = { noreturn }
 ; WINMSVC-NEXT: attributes [[ATOMIC_ATTRS]] = { nocallback nofree nounwind willreturn }
 ; WINMSVC-NEXT: attributes [[NOMEM_ATTRS]] = { nocallback nofree nosync nounwind willreturn memory(none) }
+; WINMSVC-NEXT: attributes [[NOUNWIND_ATTRS]] = { nounwind }
 ; WINMSVC-NEXT: attributes [[ARGMEM_READ_ATTRS]] = { nocallback nofree nosync nounwind willreturn memory(argmem: read) }
 ; WINMSVC-NEXT: attributes [[ERRNO_ATTRS]] = { nocallback nofree nosync nounwind willreturn memory(errnomem: write) }
 ; WINMSVC-NEXT: attributes [[ARGMEM_ATTRS]] = { nocallback nofree nosync nounwind willreturn memory(argmem: readwrite) }
@@ -1801,18 +1804,18 @@
 ; MINGW-NEXT: declare double @__adddf3(double, double) [[NOMEM_ATTRS:#[0-9]+]]
 ; MINGW-NEXT: declare float @__addsf3(float, float) [[NOMEM_ATTRS]]
 ; MINGW-NEXT: declare fp128 @__addtf3(fp128, fp128) [[NOMEM_ATTRS]]
-; MINGW-NEXT: declare aarch64_sme_preservemost_from_x1 i64 @__arm_get_current_vg()
+; MINGW-NEXT: declare aarch64_sme_preservemost_from_x1 i64 @__arm_get_current_vg() [[NOUNWIND_ATTRS:#[0-9]+]]
 ; MINGW-NEXT: declare ptr @__arm_sc_memchr(ptr readonly, i32, i64) [[ARGMEM_READ_ATTRS:#[0-9]+]]
 ; MINGW-NEXT: declare ptr @__arm_sc_memcpy(ptr, ptr, i64)
 ; MINGW-NEXT: declare ptr @__arm_sc_memmove(ptr, ptr, i64)
 ; MINGW-NEXT: declare ptr @__arm_sc_memset(ptr, i32, i64)
-; MINGW-NEXT: declare aarch64_sme_preservemost_from_x1 void @__arm_sme_restore(ptr)
-; MINGW-NEXT: declare aarch64_sme_preservemost_from_x1 void @__arm_sme_save(ptr)
-; MINGW-NEXT: declare aarch64_sme_preservemost_from_x2 { i64, i64 } @__arm_sme_state()
-; MINGW-NEXT: declare aarch64_sme_preservemost_from_x1 i64 @__arm_sme_state_size()
-; MINGW-NEXT: declare aarch64_sme_preservemost_from_x0 void @__arm_tpidr2_restore(ptr)
-; MINGW-NEXT: declare aarch64_sme_preservemost_from_x0 void @__arm_tpidr2_save()
-; MINGW-NEXT: declare aarch64_sme_preservemost_from_x0 void @__arm_za_disable()
+; MINGW-NEXT: declare aarch64_sme_preservemost_from_x1 void @__arm_sme_restore(ptr) [[NOUNWIND_ATTRS]]
+; MINGW-NEXT: declare aarch64_sme_preservemost_from_x1 void @__arm_sme_save(ptr) [[NOUNWIND_ATTRS]]
+; MINGW-NEXT: declare aarch64_sme_preservemost_from_x2 { i64, i64 } @__arm_sme_state() [[NOUNWIND_ATTRS]]
+; MINGW-NEXT: declare aarch64_sme_preservemost_from_x1 i64 @__arm_sme_state_size() [[NOUNWIND_ATTRS]]
+; MINGW-NEXT: declare aarch64_sme_preservemost_from_x0 void @__arm_tpidr2_restore(ptr) [[NOUNWIND_ATTRS]]
+; MINGW-NEXT: declare aarch64_sme_preservemost_from_x0 void @__arm_tpidr2_save() [[NOUNWIND_ATTRS]]
+; MINGW-NEXT: declare aarch64_sme_preservemost_from_x0 void @__arm_za_disable() [[NOUNWIND_ATTRS]]
 ; MINGW-NEXT: declare i64 @__ashldi3(i64, i32) [[NOMEM_ATTRS]]
 ; MINGW-NEXT: declare signext i16 @__ashlhi3(i16 signext, i32) [[NOMEM_ATTRS]]
 ; MINGW-NEXT: declare i32 @__ashlsi3(i32, i32) [[NOMEM_ATTRS]]
@@ -2225,6 +2228,7 @@
 ; MINGW-NEXT: attributes [[NORETURN_ONLY_ATTRS]] = { noreturn }
 ; MINGW-NEXT: attributes [[ATOMIC_ATTRS]] = { nocallback nofree nounwind willreturn }
 ; MINGW-NEXT: attributes [[NOMEM_ATTRS]] = { nocallback nofree nosync nounwind willreturn memory(none) }
+; MINGW-NEXT: attributes [[NOUNWIND_ATTRS]] = { nounwind }
 ; MINGW-NEXT: attributes [[ARGMEM_READ_ATTRS]] = { nocallback nofree nosync nounwind willreturn memory(argmem: read) }
 ; MINGW-NEXT: attributes [[ERRNO_ATTRS]] = { nocallback nofree nosync nounwind willreturn memory(errnomem: write) }
 ; MINGW-NEXT: attributes [[ARGMEM_ATTRS]] = { nocallback nofree nosync nounwind willreturn memory(argmem: readwrite) }
@@ -2344,18 +2348,18 @@
 ; ANDROID-NEXT: declare double @__adddf3(double, double) [[NOMEM_ATTRS:#[0-9]+]]
 ; ANDROID-NEXT: declare float @__addsf3(float, float) [[NOMEM_ATTRS]]
 ; ANDROID-NEXT: declare fp128 @__addtf3(fp128, fp128) [[NOMEM_ATTRS]]
-; ANDROID-NEXT: declare aarch64_sme_preservemost_from_x1 i64 @__arm_get_current_vg()
+; ANDROID-NEXT: declare aarch64_sme_preservemost_from_x1 i64 @__arm_get_current_vg() [[NOUNWIND_ATTRS:#[0-9]+]]
 ; ANDROID-NEXT: declare ptr @__arm_sc_memchr(ptr readonly, i32, i64) [[ARGMEM_READ_ATTRS:#[0-9]+]]
 ; ANDROID-NEXT: declare ptr @__arm_sc_memcpy(ptr, ptr, i64)
 ; ANDROID-NEXT: declare ptr @__arm_sc_memmove(ptr, ptr, i64)
 ; ANDROID-NEXT: declare ptr @__arm_sc_memset(ptr, i32, i64)
-; ANDROID-NEXT: declare aarch64_sme_preservemost_from_x1 void @__arm_sme_restore(ptr)
-; ANDROID-NEXT: declare aarch64_sme_preservemost_from_x1 void @__arm_sme_save(ptr)
-; ANDROID-NEXT: declare aarch64_sme_preservemost_from_x2 { i64, i64 } @__arm_sme_state()
-; ANDROID-NEXT: declare aarch64_sme_preservemost_from_x1 i64 @__arm_sme_state_size()
-; ANDROID-NEXT: declare aarch64_sme_preservemost_from_x0 void @__arm_tpidr2_restore(ptr)
-; ANDROID-NEXT: declare aarch64_sme_preservemost_from_x0 void @__arm_tpidr2_save()
-; ANDROID-NEXT: declare aarch64_sme_preservemost_from_x0 void @__arm_za_disable()
+; ANDROID-NEXT: declare aarch64_sme_preservemost_from_x1 void @__arm_sme_restore(ptr) [[NOUNWIND_ATTRS]]
+; ANDROID-NEXT: declare aarch64_sme_preservemost_from_x1 void @__arm_sme_save(ptr) [[NOUNWIND_ATTRS]]
+; ANDROID-NEXT: declare aarch64_sme_preservemost_from_x2 { i64, i64 } @__arm_sme_state() [[NOUNWIND_ATTRS]]
+; ANDROID-NEXT: declare aarch64_sme_preservemost_from_x1 i64 @__arm_sme_state_size() [[NOUNWIND_ATTRS]]
+; ANDROID-NEXT: declare aarch64_sme_preservemost_from_x0 void @__arm_tpidr2_restore(ptr) [[NOUNWIND_ATTRS]]
+; ANDROID-NEXT: declare aarch64_sme_preservemost_from_x0 void @__arm_tpidr2_save() [[NOUNWIND_ATTRS]]
+; ANDROID-NEXT: declare aarch64_sme_preservemost_from_x0 void @__arm_za_disable() [[NOUNWIND_ATTRS]]
 ; ANDROID-NEXT: declare i64 @__ashldi3(i64, i32) [[NOMEM_ATTRS]]
 ; ANDROID-NEXT: declare signext i16 @__ashlhi3(i16 signext, i32) [[NOMEM_ATTRS]]
 ; ANDROID-NEXT: declare i32 @__ashlsi3(i32, i32) [[NOMEM_ATTRS]]
@@ -2572,7 +2576,7 @@
 ; ANDROID-NEXT: declare float @__powisf2(float, i32) [[NOMEM_ATTRS]]
 ; ANDROID-NEXT: declare fp128 @__powitf2(fp128, i32) [[NOMEM_ATTRS]]
 ; ANDROID-NEXT: declare fp128 @__powl_finite(fp128, fp128) [[ERRNO_ATTRS]]
-; ANDROID-NEXT: declare ptr @__safestack_pointer_address()
+; ANDROID-NEXT: declare ptr @__safestack_pointer_address() [[NOUNWIND_ATTRS]]
 ; ANDROID-NEXT: declare void @__stack_chk_fail() [[NORETURN_ATTRS:#[0-9]+]]
 ; ANDROID-NEXT: declare double @__subdf3(double, double) [[NOMEM_ATTRS]]
 ; ANDROID-NEXT: declare float @__subsf3(float, float) [[NOMEM_ATTRS]]
@@ -2828,6 +2832,7 @@
 ; ANDROID-NEXT: attributes [[NORETURN_ONLY_ATTRS]] = { noreturn }
 ; ANDROID-NEXT: attributes [[ATOMIC_ATTRS]] = { nocallback nofree nounwind willreturn }
 ; ANDROID-NEXT: attributes [[NOMEM_ATTRS]] = { nocallback nofree nosync nounwind willreturn memory(none) }
+; ANDROID-NEXT: attributes [[NOUNWIND_ATTRS]] = { nounwind }
 ; ANDROID-NEXT: attributes [[ARGMEM_READ_ATTRS]] = { nocallback nofree nosync nounwind willreturn memory(argmem: read) }
 ; ANDROID-NEXT: attributes [[ERRNO_ATTRS]] = { nocallback nofree nosync nounwind willreturn memory(errnomem: write) }
 ; ANDROID-NEXT: attributes [[ARGMEM_ATTRS]] = { nocallback nofree nosync nounwind willreturn memory(argmem: readwrite) }
diff --git a/llvm/test/Transforms/Util/DeclareRuntimeLibcalls/arm.ll b/llvm/test/Transforms/Util/DeclareRuntimeLibcalls/arm.ll
index 403462b1e00cc..da4b113711b1c 100644
--- a/llvm/test/Transforms/Util/DeclareRuntimeLibcalls/arm.ll
+++ b/llvm/test/Transforms/Util/DeclareRuntimeLibcalls/arm.ll
@@ -8,9 +8,9 @@
 ; SJLJ: @__safestack_unsafe_stack_ptr = external thread_local(initialexec) global ptr
 ; SJLJ-NEXT: @__stack_chk_guard = external global ptr
 ; SJLJ-NEXT: declare arm_aapcscc i32 @_Unwind_SjLj_RaiseException(ptr)
-; SJLJ-NEXT: declare arm_aapcscc void @_Unwind_SjLj_Register(ptr)
+; SJLJ-NEXT: declare arm_aapcscc void @_Unwind_SjLj_Register(ptr) [[NOUNWIND_ATTRS:#[0-9]+]]
 ; SJLJ-NEXT: declare arm_aapcscc void @_Unwind_SjLj_Resume(ptr) [[NORETURN_ONLY_ATTRS:#[0-9]+]]
-; SJLJ-NEXT: declare arm_aapcscc void @_Unwind_SjLj_Unregister(ptr)
+; SJLJ-NEXT: declare arm_aapcscc void @_Unwind_SjLj_Unregister(ptr) [[NOUNWIND_ATTRS]]
 ; SJLJ-NEXT: declare arm_aapcscc double @__adddf3(double, double) [[NOMEM_ATTRS:#[0-9]+]]
 ; SJLJ-NEXT: declare arm_aapcscc float @__addsf3(float, float) [[NOMEM_ATTRS]]
 ; SJLJ-NEXT: declare arm_aapcscc fp128 @__addtf3(fp128, fp128) [[NOMEM_ATTRS]]
@@ -473,6 +473,7 @@
 ; SJLJ-NEXT: declare arm_aapcscc float @tgammaf(float) [[ERRNO_ATTRS]]
 ; SJLJ-NEXT: declare arm_aapcscc double @trunc(double) [[NOMEM_ATTRS]]
 ; SJLJ-NEXT: declare arm_aapcscc float @truncf(float) [[NOMEM_ATTRS]]
+; SJLJ-NEXT: attributes [[NOUNWIND_ATTRS]] = { nounwind }
 ; SJLJ-NEXT: attributes [[NORETURN_ONLY_ATTRS]] = { noreturn }
 ; SJLJ-NEXT: attributes [[NOMEM_ATTRS]] = { nocallback nofree nosync nounwind willreturn memory(none) }
 ; SJLJ-NEXT: attributes [[ARGMEM_READ_ATTRS]] = { nocallback nofree nosync nounwind willreturn memory(argmem: read) }
diff --git a/llvm/test/Transforms/Util/DeclareRuntimeLibcalls/arm64ec.ll b/llvm/test/Transforms/Util/DeclareRuntimeLibcalls/arm64ec.ll
index e415d3c249a76..0e8381d9e9992 100644
--- a/llvm/test/Transforms/Util/DeclareRuntimeLibcalls/arm64ec.ll
+++ b/llvm/test/Transforms/Util/DeclareRuntimeLibcalls/arm64ec.ll
@@ -319,7 +319,7 @@
 ; CHECK-NEXT: declare double @"#__pow_finite"(double, double) [[ERRNO_ATTRS]]
 ; CHECK-NEXT: declare float @"#__powf_finite"(float, float) [[ERRNO_ATTRS]]
 ; CHECK-NEXT: declare fp128 @"#__powitf2"(fp128, i32) [[NOMEM_ATTRS]]
-; CHECK-NEXT: declare void @"#__security_check_cookie_arm64ec"(ptr)
+; CHECK-NEXT: declare void @"#__security_check_cookie_arm64ec"(ptr) [[NOUNWIND_ATTRS:#[0-9]+]]
 ; CHECK-NEXT: declare double @"#__subdf3"(double, double) [[NOMEM_ATTRS]]
 ; CHECK-NEXT: declare float @"#__subsf3"(float, float) [[NOMEM_ATTRS]]
 ; CHECK-NEXT: declare fp128 @"#__subtf3"(fp128, fp128) [[NOMEM_ATTRS]]
@@ -524,6 +524,7 @@
 ; CHECK-NEXT: attributes [[ARGMEM_WRITE_ATTRS]] = { nocallback nofree nosync nounwind willreturn memory(argmem: write) }
 ; CHECK-NEXT: attributes [[CHK_ARGMEM_ATTRS]] = { nocallback nofree nosync nounwind memory(argmem: readwrite) }
 ; CHECK-NEXT: attributes [[CHK_ARGMEM_WRITE_ATTRS]] = { nocallback nofree nosync nounwind memory(argmem: write) }
+; CHECK-NEXT: attributes [[NOUNWIND_ATTRS]] = { nounwind }
 ; CHECK-NEXT: attributes [[CALLOC_ATTRS]] = { nofree nounwind willreturn allockind("alloc,zeroed") allocsize(0,1) memory(inaccessiblemem: readwrite, errnomem: write) "alloc-family"="malloc" }
 ; CHECK-NEXT: attributes [[FREE_ATTRS]] = { nounwind willreturn allockind("free") memory(argmem: readwrite, inaccessiblemem: readwrite) "alloc-family"="malloc" }
 ; CHECK-NEXT: attributes [[MALLOC_ATTRS]] = { nofree nounwind willreturn allockind("alloc,uninitialized") allocsize(0) memory(inaccessiblemem: readwrite, errnomem: write) "alloc-family"="malloc" }
diff --git a/llvm/test/Transforms/Util/DeclareRuntimeLibcalls/mips.ll b/llvm/test/Transforms/Util/DeclareRuntimeLibcalls/mips.ll
index c35e31b1c50cb..c7befc96e495b 100644
--- a/llvm/test/Transforms/Util/DeclareRuntimeLibcalls/mips.ll
+++ b/llvm/test/Transforms/Util/DeclareRuntimeLibcalls/mips.ll
@@ -217,10 +217,10 @@
 ; MIPS32-NEXT: declare float @__mips16_mulsf3(float, float) [[NOMEM_ATTRS]]
 ; MIPS32-NEXT: declare i32 @__mips16_nedf2(double, double) [[NOMEM_ATTRS]]
 ; MIPS32-NEXT: declare i32 @__mips16_nesf2(float, float) [[NOMEM_ATTRS]]
-; MIPS32-NEXT: declare void @__mips16_ret_dc({ double, double })
-; MIPS32-NEXT: declare void @__mips16_ret_df(double)
-; MIPS32-NEXT: declare void @__mips16_ret_sc({ float, float })
-; MIPS32-NEXT: declare void @__mips16_ret_sf(float)
+; MIPS32-NEXT: declare void @__mips16_ret_dc({ double, double }) [[NOUNWIND_ATTRS:#[0-9]+]]
+; MIPS32-NEXT: declare void @__mips16_ret_df(double) [[NOUNWIND_ATTRS]]
+; MIPS32-NEXT: declare void @__mips16_ret_sc({ float, float }) [[NOUNWIND_ATTRS]]
+; MIPS32-NEXT: declare void @__mips16_ret_sf(float) [[NOUNWIND_ATTRS]]
 ; MIPS32-NEXT: declare double @__mips16_subdf3(double, double) [[NOMEM_ATTRS]]
 ; MIPS32-NEXT: declare float @__mips16_subsf3(float, float) [[NOMEM_ATTRS]]
 ; MIPS32-NEXT: declare float @__mips16_truncdfsf2(double) [[NOMEM_ATTRS]]
@@ -460,6 +460,7 @@
 ; MIPS32-NEXT: attributes [[ARGMEM_WRITE_ATTRS]] = { nocallback nofree nosync nounwind willreturn memory(argmem: write) }
 ; MIPS32-NEXT: attributes [[CHK_ARGMEM_ATTRS]] = { nocallback nofree nosync nounwind memory(argmem: readwrite) }
 ; MIPS32-NEXT: attributes [[CHK_ARGMEM_WRITE_ATTRS]] = { nocallback nofree nosync nounwind memory(argmem: write) }
+; MIPS32-NEXT: attributes [[NOUNWIND_ATTRS]] = { nounwind }
 ; MIPS32-NEXT: attributes [[NORETURN_ATTRS]] = { nofree noreturn nounwind }
 ; MIPS32-NEXT: attributes [[CALLOC_ATTRS]] = { nofree nounwind willreturn allockind("alloc,zeroed") allocsize(0,1) memory(inaccessiblemem: readwrite, errnomem: write) "alloc-family"="malloc" }
 ; MIPS32-NEXT: attributes [[FREE_ATTRS]] = { nounwind willreturn allockind("free") memory(argmem: readwrite, inaccessiblemem: readwrite) "alloc-family"="malloc" }
diff --git a/llvm/test/Transforms/Util/DeclareRuntimeLibcalls/ve.ll b/llvm/test/Transforms/Util/DeclareRuntimeLibcalls/ve.ll
index 969898d13f233..fd0612860dbaa 100644
--- a/llvm/test/Transforms/Util/DeclareRuntimeLibcalls/ve.ll
+++ b/llvm/test/Transforms/Util/DeclareRuntimeLibcalls/ve.ll
@@ -4,9 +4,9 @@
 ; CHECK: @__safestack_unsafe_stack_ptr = external thread_local(initialexec) global ptr
 ; CHECK-NEXT: @__stack_chk_guard = external global ptr
 ; CHECK-NEXT: declare signext i32 @_Unwind_SjLj_RaiseException(ptr)
-; CHECK-NEXT: declare void @_Unwind_SjLj_Register(ptr)
+; CHECK-NEXT: declare void @_Unwind_SjLj_Register(ptr) [[NOUNWIND_ATTRS:#[0-9]+]]
 ; CHECK-NEXT: declare void @_Unwind_SjLj_Resume(ptr) [[NORETURN_ONLY_ATTRS:#[0-9]+]]
-; CHECK-NEXT: declare void @_Unwind_SjLj_Unregister(ptr)
+; CHECK-NEXT: declare void @_Unwind_SjLj_Unregister(ptr) [[NOUNWIND_ATTRS]]
 ; CHECK-NEXT: declare double @__adddf3(double, double) [[NOMEM_ATTRS:#[0-9]+]]
 ; CHECK-NEXT: declare float @__addsf3(float, float) [[NOMEM_ATTRS]]
 ; CHECK-NEXT: declare fp128 @__addtf3(fp128, fp128) [[NOMEM_ATTRS]]
@@ -475,6 +475,7 @@
 ; CHECK-NEXT: declare double @trunc(double) [[NOMEM_ATTRS]]
 ; CHECK-NEXT: declare float @truncf(float) [[NOMEM_ATTRS]]
 ; CHECK-NEXT: declare fp128 @truncl(fp128) [[NOMEM_ATTRS]]
+; CHECK-NEXT: attributes [[NOUNWIND_ATTRS]] = { nounwind }
 ; CHECK-NEXT: attributes [[NORETURN_ONLY_ATTRS]] = { noreturn }
 ; CHECK-NEXT: attributes [[NOMEM_ATTRS]] = { nocallback nofree nosync nounwind willreturn memory(none) }
 ; CHECK-NEXT: attributes [[ATOMIC_ATTRS]] = { nocallback nofree nounwind willreturn }
diff --git a/llvm/test/Transforms/Util/DeclareRuntimeLibcalls/windows.ll b/llvm/test/Transforms/Util/DeclareRuntimeLibcalls/windows.ll
index 4da9943aebcff..0fcd9d38fb7fa 100644
--- a/llvm/test/Transforms/Util/DeclareRuntimeLibcalls/windows.ll
+++ b/llvm/test/Transforms/Util/DeclareRuntimeLibcalls/windows.ll
@@ -237,7 +237,7 @@
 ; MSVC-NEXT: declare double @__pow_finite(double, double) [[ERRNO_ATTRS]]
 ; MSVC-NEXT: declare float @__powf_finite(float, float) [[ERRNO_ATTRS]]
 ; MSVC-NEXT: declare x86_fp80 @__powixf2(x86_fp80, i32) [[NOMEM_ATTRS]]
-; MSVC-NEXT: declare void @__security_check_cookie(ptr)
+; MSVC-NEXT: declare void @__security_check_cookie(ptr) [[NOUNWIND_ATTRS:#[0-9]+]]
 ; MSVC-NEXT: declare double @__subdf3(double, double) [[NOMEM_ATTRS]]
 ; MSVC-NEXT: declare float @__subsf3(float, float) [[NOMEM_ATTRS]]
 ; MSVC-NEXT: declare fp128 @__subtf3(fp128, fp128) [[NOMEM_ATTRS]]
@@ -445,6 +445,7 @@
 ; MSVC-NEXT: attributes [[ARGMEM_WRITE_ATTRS]] = { nocallback nofree nosync nounwind willreturn memory(argmem: write) }
 ; MSVC-NEXT: attributes [[CHK_ARGMEM_ATTRS]] = { nocallback nofree nosync nounwind memory(argmem: readwrite) }
 ; MSVC-NEXT: attributes [[CHK_ARGMEM_WRITE_ATTRS]] = { nocallback nofree nosync nounwind memory(argmem: write) }
+; MSVC-NEXT: attributes [[NOUNWIND_ATTRS]] = { nounwind }
 ; MSVC-NEXT: attributes [[CALLOC_ATTRS]] = { nofree nounwind willreturn allockind("alloc,zeroed") allocsize(0,1) memory(inaccessiblemem: readwrite, errnomem: write) "alloc-family"="malloc" }
 ; MSVC-NEXT: attributes [[FREE_ATTRS]] = { nounwind willreturn allockind("free") memory(argmem: readwrite, inaccessiblemem: readwrite) "alloc-family"="malloc" }
 ; MSVC-NEXT: attributes [[MALLOC_ATTRS]] = { nofree nounwind willreturn allockind("alloc,uninitialized") allocsize(0) memory(inaccessiblemem: readwrite, errnomem: write) "alloc-family"="malloc" }



More information about the llvm-branch-commits mailing list