RuntimeLibcalls: Make sure _Unwind_Resume entries are mutually exclusive #164195

arsenm · 2025-10-20T01:27:58Z

No description provided.

arsenm · 2025-10-20T01:28:15Z

This stack of pull requests is managed by Graphite. Learn more about stacking.

llvmbot · 2025-10-20T01:28:28Z

@llvm/pr-subscribers-llvm-ir

Author: Matt Arsenault (arsenm)

Changes

Full diff: https://github.com/llvm/llvm-project/pull/164195.diff

1 Files Affected:

(modified) llvm/include/llvm/IR/RuntimeLibcalls.td (+11-2)

diff --git a/llvm/include/llvm/IR/RuntimeLibcalls.td b/llvm/include/llvm/IR/RuntimeLibcalls.td
index e853f427d532a..243b864ccf033 100644
--- a/llvm/include/llvm/IR/RuntimeLibcalls.td
+++ b/llvm/include/llvm/IR/RuntimeLibcalls.td
@@ -59,6 +59,11 @@ def ExceptionModelIsNotNone : RuntimeLibcallPredicate<
   [{ExceptionModel != ExceptionHandling::None}]
 >;
 
+def ExceptionModelHasUnwindResume : RuntimeLibcallPredicate<
+  [{ExceptionModel != ExceptionHandling::None &&
+    ExceptionModel != ExceptionHandling::SjLj}]
+>;
+
 def ExceptionModelIsSjLj : RuntimeLibcallPredicate<
   [{ExceptionModel == ExceptionHandling::SjLj}]
 >;
@@ -1153,8 +1158,10 @@ def __ssp_canary_word : RuntimeLibcallImpl<STACK_CHECK_GUARD>;
 //===----------------------------------------------------------------------===//
 
 defvar ExceptionModelCalls = (add
-  LibcallImpls<(add DefaultExceptionHandlingLibcalls),
+  LibcallImpls<(add __cxa_end_cleanup),
                ExceptionModelIsNotNone>,
+  LibcallImpls<(add _Unwind_Resume),
+               ExceptionModelHasUnwindResume>,
   LibcallImpls<(add SjLjExceptionHandlingLibcalls),
                ExceptionModelIsSjLj>
 );
@@ -1396,8 +1403,10 @@ defset list<RuntimeLibcallImpl> WinArm64ECSjLjExceptionHandlingLibcalls = {
 }
 
 defvar ExceptionModelCallsArm64EC = (add
-  LibcallImpls<(add WinArm64ECDefaultExceptionHandlingLibcalls),
+  LibcallImpls<(add arm64ec___cxa_end_cleanup),
                ExceptionModelIsNotNone>,
+  LibcallImpls<(add arm64ec__Unwind_Resume),
+               ExceptionModelHasUnwindResume>,
   LibcallImpls<(add WinArm64ECSjLjExceptionHandlingLibcalls),
                ExceptionModelIsSjLj>
 );

llvmbot · 2025-10-20T01:28:28Z

@llvm/pr-subscribers-backend-aarch64

Author: Matt Arsenault (arsenm)

Changes

Full diff: https://github.com/llvm/llvm-project/pull/164195.diff

1 Files Affected:

(modified) llvm/include/llvm/IR/RuntimeLibcalls.td (+11-2)

diff --git a/llvm/include/llvm/IR/RuntimeLibcalls.td b/llvm/include/llvm/IR/RuntimeLibcalls.td
index e853f427d532a..243b864ccf033 100644
--- a/llvm/include/llvm/IR/RuntimeLibcalls.td
+++ b/llvm/include/llvm/IR/RuntimeLibcalls.td
@@ -59,6 +59,11 @@ def ExceptionModelIsNotNone : RuntimeLibcallPredicate<
   [{ExceptionModel != ExceptionHandling::None}]
 >;
 
+def ExceptionModelHasUnwindResume : RuntimeLibcallPredicate<
+  [{ExceptionModel != ExceptionHandling::None &&
+    ExceptionModel != ExceptionHandling::SjLj}]
+>;
+
 def ExceptionModelIsSjLj : RuntimeLibcallPredicate<
   [{ExceptionModel == ExceptionHandling::SjLj}]
 >;
@@ -1153,8 +1158,10 @@ def __ssp_canary_word : RuntimeLibcallImpl<STACK_CHECK_GUARD>;
 //===----------------------------------------------------------------------===//
 
 defvar ExceptionModelCalls = (add
-  LibcallImpls<(add DefaultExceptionHandlingLibcalls),
+  LibcallImpls<(add __cxa_end_cleanup),
                ExceptionModelIsNotNone>,
+  LibcallImpls<(add _Unwind_Resume),
+               ExceptionModelHasUnwindResume>,
   LibcallImpls<(add SjLjExceptionHandlingLibcalls),
                ExceptionModelIsSjLj>
 );
@@ -1396,8 +1403,10 @@ defset list<RuntimeLibcallImpl> WinArm64ECSjLjExceptionHandlingLibcalls = {
 }
 
 defvar ExceptionModelCallsArm64EC = (add
-  LibcallImpls<(add WinArm64ECDefaultExceptionHandlingLibcalls),
+  LibcallImpls<(add arm64ec___cxa_end_cleanup),
                ExceptionModelIsNotNone>,
+  LibcallImpls<(add arm64ec__Unwind_Resume),
+               ExceptionModelHasUnwindResume>,
   LibcallImpls<(add WinArm64ECSjLjExceptionHandlingLibcalls),
                ExceptionModelIsSjLj>
 );

llvmbot · 2025-10-20T01:28:28Z

@llvm/pr-subscribers-backend-arm

Author: Matt Arsenault (arsenm)

Changes

Full diff: https://github.com/llvm/llvm-project/pull/164195.diff

1 Files Affected:

(modified) llvm/include/llvm/IR/RuntimeLibcalls.td (+11-2)

diff --git a/llvm/include/llvm/IR/RuntimeLibcalls.td b/llvm/include/llvm/IR/RuntimeLibcalls.td
index e853f427d532a..243b864ccf033 100644
--- a/llvm/include/llvm/IR/RuntimeLibcalls.td
+++ b/llvm/include/llvm/IR/RuntimeLibcalls.td
@@ -59,6 +59,11 @@ def ExceptionModelIsNotNone : RuntimeLibcallPredicate<
   [{ExceptionModel != ExceptionHandling::None}]
 >;
 
+def ExceptionModelHasUnwindResume : RuntimeLibcallPredicate<
+  [{ExceptionModel != ExceptionHandling::None &&
+    ExceptionModel != ExceptionHandling::SjLj}]
+>;
+
 def ExceptionModelIsSjLj : RuntimeLibcallPredicate<
   [{ExceptionModel == ExceptionHandling::SjLj}]
 >;
@@ -1153,8 +1158,10 @@ def __ssp_canary_word : RuntimeLibcallImpl<STACK_CHECK_GUARD>;
 //===----------------------------------------------------------------------===//
 
 defvar ExceptionModelCalls = (add
-  LibcallImpls<(add DefaultExceptionHandlingLibcalls),
+  LibcallImpls<(add __cxa_end_cleanup),
                ExceptionModelIsNotNone>,
+  LibcallImpls<(add _Unwind_Resume),
+               ExceptionModelHasUnwindResume>,
   LibcallImpls<(add SjLjExceptionHandlingLibcalls),
                ExceptionModelIsSjLj>
 );
@@ -1396,8 +1403,10 @@ defset list<RuntimeLibcallImpl> WinArm64ECSjLjExceptionHandlingLibcalls = {
 }
 
 defvar ExceptionModelCallsArm64EC = (add
-  LibcallImpls<(add WinArm64ECDefaultExceptionHandlingLibcalls),
+  LibcallImpls<(add arm64ec___cxa_end_cleanup),
                ExceptionModelIsNotNone>,
+  LibcallImpls<(add arm64ec__Unwind_Resume),
+               ExceptionModelHasUnwindResume>,
   LibcallImpls<(add WinArm64ECSjLjExceptionHandlingLibcalls),
                ExceptionModelIsSjLj>
 );

llvmbot · 2025-10-20T01:28:29Z

@llvm/pr-subscribers-backend-x86

Author: Matt Arsenault (arsenm)

Changes

Full diff: https://github.com/llvm/llvm-project/pull/164195.diff

1 Files Affected:

(modified) llvm/include/llvm/IR/RuntimeLibcalls.td (+11-2)

diff --git a/llvm/include/llvm/IR/RuntimeLibcalls.td b/llvm/include/llvm/IR/RuntimeLibcalls.td
index e853f427d532a..243b864ccf033 100644
--- a/llvm/include/llvm/IR/RuntimeLibcalls.td
+++ b/llvm/include/llvm/IR/RuntimeLibcalls.td
@@ -59,6 +59,11 @@ def ExceptionModelIsNotNone : RuntimeLibcallPredicate<
   [{ExceptionModel != ExceptionHandling::None}]
 >;
 
+def ExceptionModelHasUnwindResume : RuntimeLibcallPredicate<
+  [{ExceptionModel != ExceptionHandling::None &&
+    ExceptionModel != ExceptionHandling::SjLj}]
+>;
+
 def ExceptionModelIsSjLj : RuntimeLibcallPredicate<
   [{ExceptionModel == ExceptionHandling::SjLj}]
 >;
@@ -1153,8 +1158,10 @@ def __ssp_canary_word : RuntimeLibcallImpl<STACK_CHECK_GUARD>;
 //===----------------------------------------------------------------------===//
 
 defvar ExceptionModelCalls = (add
-  LibcallImpls<(add DefaultExceptionHandlingLibcalls),
+  LibcallImpls<(add __cxa_end_cleanup),
                ExceptionModelIsNotNone>,
+  LibcallImpls<(add _Unwind_Resume),
+               ExceptionModelHasUnwindResume>,
   LibcallImpls<(add SjLjExceptionHandlingLibcalls),
                ExceptionModelIsSjLj>
 );
@@ -1396,8 +1403,10 @@ defset list<RuntimeLibcallImpl> WinArm64ECSjLjExceptionHandlingLibcalls = {
 }
 
 defvar ExceptionModelCallsArm64EC = (add
-  LibcallImpls<(add WinArm64ECDefaultExceptionHandlingLibcalls),
+  LibcallImpls<(add arm64ec___cxa_end_cleanup),
                ExceptionModelIsNotNone>,
+  LibcallImpls<(add arm64ec__Unwind_Resume),
+               ExceptionModelHasUnwindResume>,
   LibcallImpls<(add WinArm64ECSjLjExceptionHandlingLibcalls),
                ExceptionModelIsSjLj>
 );

arsenm · 2025-10-24T12:33:24Z

ping

mstorsjo · 2025-10-24T12:39:05Z

The git diff here shows things that I believe belong to earlier merged patches it seems, can you update it so that it shows the relevant bits only?

As for the change in the last commit - it looks trivial, but I'm not really familiar enough with tablegen at all to be able to confidently say what it does, unfortunately. So I can either give a "if you say so, it's probably right" review, or just defer to someone else.

dpaoliello · 2025-10-24T17:44:50Z

Should DefaultExceptionHandlingLibcalls be removed? I don't believe it's being used anymore...

dpaoliello · 2025-10-24T17:45:15Z

Also, NFC tag in title?

arsenm · 2025-10-25T00:44:47Z

DefaultExceptionHandlingLibcalls

No, it's still being used for the duplication for the arm64ec case

arsenm · 2025-10-25T00:45:45Z

Also, NFC tag in title?

I don't particularly like NFC tags, this is a minor functionality change it's just not easily observable

llvm-ci · 2025-10-27T04:25:14Z

LLVM Buildbot has detected a new failure on builder clang-aarch64-quick running on linaro-clang-aarch64-quick while building llvm at step 5 "ninja check 1".

Full details are available at: https://lab.llvm.org/buildbot/#/builders/65/builds/24552

Here is the relevant piece of the build log for the reference

Step 5 (ninja check 1) failure: stage 1 checked (failure)
******************** TEST 'lit :: timeout-hang.py' FAILED ********************
Exit Code: 1

Command Output (stdout):
--
# RUN: at line 18
not env -u FILECHECK_OPTS "/usr/bin/python3.10" /home/tcwg-buildbot/worker/clang-aarch64-quick/llvm/llvm/utils/lit/lit.py -j1 --order=lexical Inputs/timeout-hang/run-nonexistent.txt  --timeout=15 --param external=0 | "/usr/bin/python3.10" /home/tcwg-buildbot/worker/clang-aarch64-quick/stage1/utils/lit/tests/timeout-hang.py 5
# executed command: not env -u FILECHECK_OPTS /usr/bin/python3.10 /home/tcwg-buildbot/worker/clang-aarch64-quick/llvm/llvm/utils/lit/lit.py -j1 --order=lexical Inputs/timeout-hang/run-nonexistent.txt --timeout=15 --param external=0
# .---command stderr------------
# | lit.py: /home/tcwg-buildbot/worker/clang-aarch64-quick/llvm/llvm/utils/lit/lit/main.py:74: note: The test suite configuration requested an individual test timeout of 0 seconds but a timeout of 15 seconds was requested on the command line. Forcing timeout to be 15 seconds.
# `-----------------------------
# executed command: /usr/bin/python3.10 /home/tcwg-buildbot/worker/clang-aarch64-quick/stage1/utils/lit/tests/timeout-hang.py 5
# .---command stdout------------
# | Testing took 5.84s, which is beyond the grace period of 5.0s
# `-----------------------------
# error: command failed with exit status: 1

--

********************

…ive (llvm#164195)

arsenm added backend:AArch64 backend:ARM backend:X86 llvm:codegen llvm:ir labels Oct 20, 2025 — with Graphite App

arsenm requested a review from dpaoliello October 20, 2025 01:28

arsenm mentioned this pull request Oct 20, 2025

CodeGen: Remove overrides of getSSPStackGuardCheck (NFC) #164044

Merged

arsenm requested review from efriedma-quic, mstorsjo and rnk October 20, 2025 01:28

arsenm mentioned this pull request Oct 20, 2025

RuntimeLibcalls: Avoid reporting __stack_chk_guard as available for msvc #164133

Merged

arsenm marked this pull request as ready for review October 20, 2025 01:28

arsenm force-pushed the users/arsenm/runtime-libcalls/mutually-exclusive-unwind-resume branch from 69a5b22 to 71b7a3e Compare October 22, 2025 09:57

arsenm force-pushed the users/arsenm/runtime-libcalls/avoid-reporting-__stack_chk_guard-msvc branch from 8876a86 to 5c5fa40 Compare October 22, 2025 09:57

arsenm mentioned this pull request Oct 22, 2025

X86: Make sure compiler-rt div calls are not added for msvc #164591

Merged

Base automatically changed from users/arsenm/runtime-libcalls/avoid-reporting-__stack_chk_guard-msvc to main October 24, 2025 12:18

RuntimeLibcalls: Make sure _Unwind_Resume entries are mutually exclusive

66d3765

arsenm force-pushed the users/arsenm/runtime-libcalls/mutually-exclusive-unwind-resume branch from 71b7a3e to 66d3765 Compare October 24, 2025 13:51

This was referenced Oct 24, 2025

ARM: Avoid adding default libcalls overridden by AEABI functions #164983

Merged

RuntimeLibcalls: Split lowering decisions into LibcallLoweringInfo #164987

Merged

arsenm merged commit 6b885c3 into main Oct 27, 2025
10 checks passed

arsenm deleted the users/arsenm/runtime-libcalls/mutually-exclusive-unwind-resume branch October 27, 2025 04:08

This was referenced Oct 27, 2025

Analysis: Add RuntimeLibcall analysis pass #165196

Merged

ExpandFp: Require RuntimeLibcallsInfo analysis #165197

Open

varun-r-mallya pushed a commit to varun-r-mallya/llvm-project that referenced this pull request Oct 27, 2025

RuntimeLibcalls: Make sure _Unwind_Resume entries are mutually exclus…

abde337

…ive (llvm#164195)

dvbuka pushed a commit to dvbuka/llvm-project that referenced this pull request Oct 27, 2025

RuntimeLibcalls: Make sure _Unwind_Resume entries are mutually exclus…

b76e615

…ive (llvm#164195)

Lukacma pushed a commit to Lukacma/llvm-project that referenced this pull request Oct 29, 2025

RuntimeLibcalls: Make sure _Unwind_Resume entries are mutually exclus…

973a3e0

…ive (llvm#164195)

aokblast pushed a commit to aokblast/llvm-project that referenced this pull request Oct 30, 2025

RuntimeLibcalls: Make sure _Unwind_Resume entries are mutually exclus…

c874900

…ive (llvm#164195)

RuntimeLibcalls: Make sure _Unwind_Resume entries are mutually exclusive #164195

RuntimeLibcalls: Make sure _Unwind_Resume entries are mutually exclusive #164195

Uh oh!

Conversation

arsenm commented Oct 20, 2025

Uh oh!

arsenm commented Oct 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

llvmbot commented Oct 20, 2025

Uh oh!

llvmbot commented Oct 20, 2025

Uh oh!

llvmbot commented Oct 20, 2025

Uh oh!

llvmbot commented Oct 20, 2025

Uh oh!

arsenm commented Oct 24, 2025

Uh oh!

mstorsjo commented Oct 24, 2025

Uh oh!

dpaoliello commented Oct 24, 2025

Uh oh!

dpaoliello commented Oct 24, 2025

Uh oh!

arsenm commented Oct 25, 2025

Uh oh!

arsenm commented Oct 25, 2025

Uh oh!

Uh oh!

llvm-ci commented Oct 27, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

arsenm commented Oct 20, 2025 •

edited

Loading