From d1947c68c96e3b042851a20ad027266f44edc809 Mon Sep 17 00:00:00 2001
From: AMZN-AlexOteiza <82234181+AMZN-AlexOteiza@users.noreply.github.com>
Date: Thu, 7 Oct 2021 13:29:09 +0100
Subject: [PATCH] Added extra output and callstack information for improving
 debugging automated tests (#4528)

Signed-off-by: AMZN-AlexOteiza <aljanru@amazon.co.uk>
---
 Code/Editor/CryEdit.cpp                      | 2 ++
 Code/Framework/AzCore/AzCore/Debug/Trace.cpp | 2 ++
 Code/Legacy/CrySystem/DebugCallStack.cpp     | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/Code/Editor/CryEdit.cpp b/Code/Editor/CryEdit.cpp
index 4aa3d22114..abba2bb9c6 100644
--- a/Code/Editor/CryEdit.cpp
+++ b/Code/Editor/CryEdit.cpp
@@ -2124,6 +2124,8 @@ bool CCryEditApp::FixDanglingSharedMemory(const QString& sharedMemName) const
 
 int CCryEditApp::ExitInstance(int exitCode)
 {
+    AZ_TracePrintf("Exit", "Called ExitInstance() with exit code: 0x%x", exitCode);
+
     if (m_pEditor)
     {
         m_pEditor->OnBeginShutdownSequence();
diff --git a/Code/Framework/AzCore/AzCore/Debug/Trace.cpp b/Code/Framework/AzCore/AzCore/Debug/Trace.cpp
index 14504cc282..3edcbaa273 100644
--- a/Code/Framework/AzCore/AzCore/Debug/Trace.cpp
+++ b/Code/Framework/AzCore/AzCore/Debug/Trace.cpp
@@ -224,6 +224,8 @@ namespace AZ
 
     void Debug::Trace::Terminate(int exitCode)
     {
+        AZ_TracePrintf("Exit", "Called Terminate() with exit code: 0x%x", exitCode);
+        AZ::Debug::Trace::PrintCallstack("Exit");
         Platform::Terminate(exitCode);
     }
 
diff --git a/Code/Legacy/CrySystem/DebugCallStack.cpp b/Code/Legacy/CrySystem/DebugCallStack.cpp
index 8018e46d69..19fe4ce8df 100644
--- a/Code/Legacy/CrySystem/DebugCallStack.cpp
+++ b/Code/Legacy/CrySystem/DebugCallStack.cpp
@@ -222,6 +222,9 @@ void UpdateFPExceptionsMaskForThreads()
 //////////////////////////////////////////////////////////////////////////
 int DebugCallStack::handleException(EXCEPTION_POINTERS* exception_pointer)
 {
+    AZ_TracePrintf("Exit", "Exception with exit code: 0x%x", exception_pointer->ExceptionRecord->ExceptionCode);
+    AZ::Debug::Trace::PrintCallstack("Exit");
+
     if (gEnv == NULL)
     {
         return EXCEPTION_EXECUTE_HANDLER;