Skip to content
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

Jump to bottom

Disable NORETURN annotation on PROCAbort for Arm #99587

Merged
merged 2 commits into from
Mar 13, 2024
Merged

Disable NORETURN annotation on PROCAbort for Arm #99587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
930ee7b
Disable NORETURN annotation on PROCAbort for Arm
jkotas Mar 12, 2024
d301535
Fix build break
jkotas Mar 12, 2024
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
3 changes: 3 additions & 0 deletions src/coreclr/pal/src/include/pal/process.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,10 @@ BOOL PROCAbortInitialize();

Does not return
--*/
#if !defined(HOST_ARM) // PAL_NORETURN produces broken unwinding information for this method
// making crash dumps impossible to analyze
PAL_NORETURN
#endif
VOID PROCAbort(int signal = SIGABRT, siginfo_t* siginfo = nullptr);

/*++
Expand Down
4 changes: 3 additions & 1 deletion src/coreclr/pal/src/thread/process.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1271,7 +1271,7 @@ RaiseFailFastException(
ENTRY("RaiseFailFastException");

TerminateCurrentProcessNoExit(TRUE);
PROCAbort();
for (;;) PROCAbort();
jkotas marked this conversation as resolved.
Show resolved Hide resolved

LOGEXIT("RaiseFailFastException");
PERF_EXIT(RaiseFailFastException);
Expand Down Expand Up @@ -2541,7 +2541,9 @@ PROCCreateCrashDumpIfEnabled(int signal, siginfo_t* siginfo, bool serialize)

Does not return
--*/
#if !defined(HOST_ARM)
PAL_NORETURN
#endif
VOID
PROCAbort(int signal, siginfo_t* siginfo)
{
Expand Down