From 12aaae4f204349cee10eaffabf8076adc57d4c35 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 27 Apr 2023 17:04:54 -0700
Subject: [PATCH] Fix createdump arg parsing for signal-based exceptions
 (#85423)

Co-authored-by: Juan Sebastian Hoyos Ayala <juan.s.hoyos@outlook.com>
---
 src/coreclr/debug/createdump/createdump.h | 2 +-
 src/coreclr/debug/createdump/main.cpp     | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/coreclr/debug/createdump/createdump.h b/src/coreclr/debug/createdump/createdump.h
index 7203300af089c..51ffca9c52026 100644
--- a/src/coreclr/debug/createdump/createdump.h
+++ b/src/coreclr/debug/createdump/createdump.h
@@ -100,7 +100,7 @@ typedef struct
     int Pid;
     int CrashThread;
     int Signal;
-#if defined(HOST_UNIX) && !defined(HOST_OSX)
+#if defined(HOST_UNIX)
     int SignalCode;
     int SignalErrno;
     void* SignalAddress;
diff --git a/src/coreclr/debug/createdump/main.cpp b/src/coreclr/debug/createdump/main.cpp
index b54cab825025e..75a616dc2e47b 100644
--- a/src/coreclr/debug/createdump/main.cpp
+++ b/src/coreclr/debug/createdump/main.cpp
@@ -70,7 +70,7 @@ int __cdecl main(const int argc, const char* argv[])
     options.Signal = 0;
     options.CrashThread = 0;
     options.Pid = 0;
-#if defined(HOST_UNIX) && !defined(HOST_OSX)
+#if defined(HOST_UNIX)
     options.SignalCode = 0;
     options.SignalErrno = 0;
     options.SignalAddress = nullptr;
@@ -161,7 +161,6 @@ int __cdecl main(const int argc, const char* argv[])
             {
                 g_checkForSingleFile = true;
             }
-#ifndef HOST_OSX
             else if (strcmp(*argv, "--code") == 0)
             {
                 options.SignalCode = atoi(*++argv);
@@ -174,7 +173,6 @@ int __cdecl main(const int argc, const char* argv[])
             {
                 options.SignalAddress = (void*)atoll(*++argv);
             }
-#endif
 #endif
             else if ((strcmp(*argv, "-d") == 0) || (strcmp(*argv, "--diag") == 0))
             {