Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 27, 2025
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66d3765
RuntimeLibcalls: Make sure _Unwind_Resume entries are mutually exclusive
arsenm Oct 19, 2025
a84fbd5
X86: Make sure compiler-rt div calls are not added for msvc
arsenm Oct 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions llvm/include/llvm/IR/RuntimeLibcalls.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}]
>;
Expand Down Expand Up @@ -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>
);
Expand Down Expand Up @@ -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>
);
Expand Down Expand Up @@ -2443,6 +2452,11 @@ def _aullrem : RuntimeLibcallImpl<UREM_I64>;
def _allmul : RuntimeLibcallImpl<MUL_I64>;
}

// FIXME: Should have utility function to filter by known provider.
defvar WindowsDivRemMulLibcallOverrides = [
__divdi3, __udivdi3, __moddi3, __umoddi3, __muldi3
];

//===----------------------------------------------------------------------===//
// X86 Runtime Libcalls
//===----------------------------------------------------------------------===//
Expand All @@ -2464,7 +2478,7 @@ defvar X86_F128_Libcalls = LibcallImpls<(add LibmF128Libcalls, LibmF128FiniteLib
defvar SinCosF32F64Libcalls = LibcallImpls<(add sincosf, sincos), hasSinCos_f32_f64>;

defvar X86CommonLibcalls =
(add WinDefaultLibcallImpls,
(add (sub WinDefaultLibcallImpls, WindowsDivRemMulLibcallOverrides),
DarwinSinCosStret, DarwinExp10,
X86_F128_Libcalls,
LibmHasSinCosF80, // FIXME: Depends on long double
Expand All @@ -2487,10 +2501,15 @@ defvar Windows32DivRemMulCalls =
LibcallsWithCC<(add WindowsDivRemMulLibcalls), X86_STDCALL,
RuntimeLibcallPredicate<"TT.isWindowsMSVCEnvironment() || TT.isWindowsItaniumEnvironment()">>;

defvar NotWindows32DivRemMulCalls =
LibcallImpls<(add WindowsDivRemMulLibcallOverrides),
RuntimeLibcallPredicate<"!TT.isWindowsMSVCEnvironment() && !TT.isWindowsItaniumEnvironment()">>;

def X86_32SystemLibrary
: SystemRuntimeLibrary<isX86_32,
(add X86CommonLibcalls,
Windows32DivRemMulCalls)>;
NotWindows32DivRemMulCalls,
Windows32DivRemMulCalls)>;

def X86_64SystemLibrary
: SystemRuntimeLibrary<isX86_64,
Expand Down
Loading