NativeAOT createdump fork/exec for crash dump generation

src/coreclr/debug/createdump/crashinfo.cpp

@@ -22,6 +22,7 @@ CrashInfo::CrashInfo(const CreateDumpOptions& options) :
     m_gatherFrames(options.CrashReport),
     m_crashThread(options.CrashThread),
     m_signal(options.Signal),
+    m_exceptionRecord(options.ExceptionRecord),
     m_moduleInfos(&ModuleInfoCompare),
     m_mainModule(nullptr),
     m_cbModuleMappings(0),
@@ -39,7 +40,7 @@ CrashInfo::CrashInfo(const CreateDumpOptions& options) :
     m_siginfo.si_signo = options.Signal;
     m_siginfo.si_code = options.SignalCode;
     m_siginfo.si_errno = options.SignalErrno;
-    m_siginfo.si_addr = options.SignalAddress;
+    m_siginfo.si_addr = (void*)options.SignalAddress;
 }
 
 CrashInfo::~CrashInfo()

src/coreclr/debug/createdump/crashinfo.h

@@ -55,6 +55,7 @@ class CrashInfo : public ICLRDataEnumMemoryRegionsCallback, public ICLRDataLoggi
     bool m_gatherFrames;                            // if true, add the native and managed stack frames to the thread info
     pid_t m_crashThread;                            // crashing thread id or 0 if none
     uint32_t m_signal;                              // crash signal code or 0 if none
+    uint64_t m_exceptionRecord;                     // exception record address or 0 if none
     std::string m_name;                             // exe name
     siginfo_t m_siginfo;                            // signal info (if any)
     std::string m_coreclrPath;                      // the path of the coreclr module or empty if none
@@ -115,6 +116,7 @@ class CrashInfo : public ICLRDataEnumMemoryRegionsCallback, public ICLRDataLoggi
     inline const bool GatherFrames() const { return m_gatherFrames; }
     inline const pid_t CrashThread() const { return m_crashThread; }
     inline const uint32_t Signal() const { return m_signal; }
+    inline const uint64_t ExceptionRecord () const { return m_exceptionRecord; }
     inline const std::string& Name() const { return m_name; }
     inline const ModuleInfo* MainModule() const { return m_mainModule; }
     inline const uint64_t RuntimeBaseAddress() const { return m_runtimeBaseAddress; }

src/coreclr/debug/createdump/createdump.h

@@ -119,7 +119,8 @@ typedef struct
     int Signal;
     int SignalCode;
     int SignalErrno;
-    void* SignalAddress;
+    uint64_t SignalAddress;
+    uint64_t ExceptionRecord;
 } CreateDumpOptions;
 
 #ifdef HOST_UNIX

src/coreclr/debug/createdump/createdumpmain.cpp

@@ -71,11 +71,10 @@ int createdump_main(const int argc, const char* argv[])
     options.Signal = 0;
     options.CrashThread = 0;
     options.Pid = 0;
-#if defined(HOST_UNIX) && !defined(HOST_OSX)
     options.SignalCode = 0;
     options.SignalErrno = 0;
-    options.SignalAddress = nullptr;
-#endif
+    options.SignalAddress = 0;
+    options.ExceptionRecord = 0;
     bool help = false;
     int exitCode = 0;
 
@@ -141,7 +140,11 @@ int createdump_main(const int argc, const char* argv[])
             }
             else if (strcmp(*argv, "--address") == 0)
             {
-                options.SignalAddress = (void*)atoll(*++argv);
+                options.SignalAddress = atoll(*++argv);
+            }
+            else if (strcmp(*argv, "--exception-record") == 0)
+            {
+                options.ExceptionRecord = atoll(*++argv);
             }
 #endif
             else if ((strcmp(*argv, "-d") == 0) || (strcmp(*argv, "--diag") == 0))

src/coreclr/nativeaot/Runtime/RuntimeInstance.cpp

@@ -37,7 +37,7 @@ bool ShouldHijackForGcStress(uintptr_t CallsiteIP, HijackType ht);
 #include "shash.inl"
 
 #define MAX_CRASHINFOBUFFER_SIZE 8192
-uint8_t g_CrashInfoBuffer[MAX_CRASHINFOBUFFER_SIZE];
+uint8_t g_CrashInfoBuffer[MAX_CRASHINFOBUFFER_SIZE] = { 0 };
 
 ThreadStore *   RuntimeInstance::GetThreadStore()
 {

src/coreclr/nativeaot/Runtime/unix/PalCreateDump.cpp

@@ -343,11 +343,12 @@ CreateCrashDump(
 Parameters:
     signal - POSIX signal number or 0
     siginfo - signal info or nullptr
+    exceptionRecord - address of exception record or nullptr
 
 (no return value)
 --*/
 void
-PalCreateCrashDumpIfEnabled(int signal, siginfo_t* siginfo)
+PalCreateCrashDumpIfEnabled(int signal, siginfo_t* siginfo, void* exceptionRecord)
 {
     // If enabled, launch the create minidump utility and wait until it completes
     if (g_argvCreateDump[0] != nullptr)
@@ -358,6 +359,7 @@ PalCreateCrashDumpIfEnabled(int signal, siginfo_t* siginfo)
         char* signalCodeArg = nullptr;
         char* signalErrnoArg = nullptr;
         char* signalAddressArg = nullptr;
+        char* exceptionRecordArg = nullptr;
 
         // Copy the createdump argv
         int argc = 0;
@@ -388,7 +390,7 @@ PalCreateCrashDumpIfEnabled(int signal, siginfo_t* siginfo)
                 argv[argc++] = crashThreadArg;
             }
 
-            if (siginfo != nullptr)
+            if (siginfo != nullptr && argc < MAX_ARGV_ENTRIES)
             {
                 signalCodeArg = FormatInt(siginfo->si_code);
                 if (signalCodeArg != nullptr)
@@ -410,6 +412,16 @@ PalCreateCrashDumpIfEnabled(int signal, siginfo_t* siginfo)
                 }
             }
 
+            if (exceptionRecord != nullptr && argc < MAX_ARGV_ENTRIES)
+            {
+                exceptionRecordArg = FormatInt64((uint64_t)exceptionRecord);
+                if (exceptionRecordArg != nullptr)
+                {
+                    argv[argc++] = "--exception-record";
+                    argv[argc++] = exceptionRecordArg;
+                }
+            }
+
             argv[argc++] = nullptr;
             assert(argc < MAX_ARGV_ENTRIES);
         }
@@ -421,19 +433,20 @@ PalCreateCrashDumpIfEnabled(int signal, siginfo_t* siginfo)
         free(signalCodeArg);
         free(signalErrnoArg);
         free(signalAddressArg);
+        free(exceptionRecordArg);
     }
 }
 
 void
 PalCreateCrashDumpIfEnabled()
 {
-    PalCreateCrashDumpIfEnabled(SIGABRT, nullptr);
+    PalCreateCrashDumpIfEnabled(SIGABRT, nullptr, nullptr);
 }
 
 void
 PalCreateCrashDumpIfEnabled(void* pExceptionRecord, void* pExContext)
 {
-    PalCreateCrashDumpIfEnabled(SIGABRT, nullptr);
+    PalCreateCrashDumpIfEnabled(SIGABRT, nullptr, pExceptionRecord);
 }
 
 /*++

src/coreclr/nativeaot/Runtime/unix/PalCreateDump.h

@@ -7,5 +7,5 @@
 
 extern bool PalCreateDumpInitialize();
 extern void PalCreateCrashDumpIfEnabled();
-extern void PalCreateCrashDumpIfEnabled(int signal, siginfo_t* siginfo);
+extern void PalCreateCrashDumpIfEnabled(int signal, siginfo_t* siginfo = nullptr, void* exceptionRecord = nullptr);
 extern void PalCreateCrashDumpIfEnabled(void* pExceptionRecord, void* pExContext);