From: Eduardo Velarde <32459232+eduardo-vp@users.noreply.github.com>
Date: Thu, 15 Sep 2022 21:08:03 +0000 (-0700)
Subject: Fix FailFast logging message (#75685)
X-Git-Tag: accepted/tizen/unified/riscv/20231226.055536~6422
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bc3e8a5a35f4e0036488080b1f089a4ebd12ca27;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Fix FailFast logging message (#75685)
---

diff --git a/src/coreclr/dlls/mscorrc/mscorrc.rc b/src/coreclr/dlls/mscorrc/mscorrc.rc
index dfcf88c..b4ba942 100644
--- a/src/coreclr/dlls/mscorrc/mscorrc.rc
+++ b/src/coreclr/dlls/mscorrc/mscorrc.rc
@@ -548,7 +548,7 @@ BEGIN
     IDS_ER_STACK_OVERFLOW                    "Description: The process was terminated due to stack overflow."
     IDS_ER_STACK                             "Stack:"
     IDS_ER_WORDAT                            "at"
-    IDS_ER_UNMANAGEDFAILFASTMSG              "at IP 0x%x (0x%x) with exit code 0x%x."
+    IDS_ER_UNMANAGEDFAILFASTMSG              "at IP 0x%1 (0x%2) with exit code 0x%3."
     IDS_ER_UNHANDLEDEXCEPTIONINFO            "exception code %1, exception address %2"
     IDS_ER_MESSAGE_TRUNCATE                  "The remainder of the message was truncated."
     IDS_ER_CODECONTRACT_FAILED               "Description: The application encountered a bug.  A managed code contract (precondition, postcondition, object invariant, or assert) failed."
diff --git a/src/coreclr/vm/eepolicy.cpp b/src/coreclr/vm/eepolicy.cpp
index ae56deb..655e971 100644
--- a/src/coreclr/vm/eepolicy.cpp
+++ b/src/coreclr/vm/eepolicy.cpp
@@ -469,7 +469,7 @@ void EEPolicy::LogFatalError(UINT exitCode, UINT_PTR address, LPCWSTR pszMessage
                 InlineSString<80> ssMessage;
                 InlineSString<80> ssErrorFormat;
                 if(!ssErrorFormat.LoadResource(CCompRC::Optional, IDS_ER_UNMANAGEDFAILFASTMSG ))
-                    ssErrorFormat.Set(W("at IP 0x%x (0x%x) with exit code 0x%x."));
+                    ssErrorFormat.Set(W("at IP 0x%1 (0x%2) with exit code 0x%3."));
                 SmallStackSString addressString;
                 addressString.Printf(W("%p"), pExceptionInfo? (PVOID)pExceptionInfo->ExceptionRecord->ExceptionAddress : (PVOID)address);