Fix SuperPMI assertion call in MethodContext::recGetHelperFtn() (#90778)

BruceForstall · web-flow · commit 028ad321f409 · 2023-08-18T11:36:40.000-07:00
* Fix SuperPMI assertion call in `MethodContext::recGetHelperFtn()`

We can't use string concatenation in an argument to the `AssertCodeMsg`
macro, so construct the string we want to print first.

* Feedback
diff --git a/src/coreclr/tools/superpmi/superpmi-shared/errorhandling.h b/src/coreclr/tools/superpmi/superpmi-shared/errorhandling.h
@@ -34,7 +34,7 @@ void MSC_ONLY(__declspec(noreturn)) ThrowRecordedException(DWORD innerExceptionC
     do                                                                                                                 \
     {                                                                                                                  \
         if (!(expr))                                                                                                   \
-            LogException(exCode, "SuperPMI assertion '%s' failed (" #msg ")", #expr, ##__VA_ARGS__);                   \
+            LogException(exCode, "SuperPMI assertion '%s' failed (" msg ")", #expr, ##__VA_ARGS__);                    \
     } while (0)
 
 #define AssertCode(expr, exCode)                                                                                       \
diff --git a/src/coreclr/tools/superpmi/superpmi-shared/logging.h b/src/coreclr/tools/superpmi/superpmi-shared/logging.h
@@ -30,7 +30,7 @@
     do                                                                                                                 \
     {                                                                                                                  \
         Logger::LogExceptionMessage(__FUNCTION__, __FILE__, __LINE__, exCode, msg, __VA_ARGS__);                       \
-        ThrowSpmiException(exCode, msg, __VA_ARGS__);                                                                      \
+        ThrowSpmiException(exCode, msg, __VA_ARGS__);                                                                  \
     } while (0)
 
 // These are specified as flags so subsets of the logging functionality can be enabled/disabled at once
diff --git a/src/coreclr/tools/superpmi/superpmi-shared/methodcontext.cpp b/src/coreclr/tools/superpmi/superpmi-shared/methodcontext.cpp
@@ -2365,7 +2365,7 @@ void MethodContext::recGetHelperFtn(CorInfoHelpFunc ftnNum, void** ppIndirection
         DLDL oldValue = GetHelperFtn->Get(key);
 
         AssertCodeMsg(oldValue.A == value.A && oldValue.B == oldValue.B, EXCEPTIONCODE_MC,
-                      "collision! old: %016" PRIX64 " %016" PRIX64 ", new: %016" PRIX64 " %016" PRIX64 " \n", oldValue.A, oldValue.B, value.A,
+                      "collision! old: %016" PRIX64 " %016" PRIX64 ", new: %016" PRIX64 " %016" PRIX64, oldValue.A, oldValue.B, value.A,
                       value.B);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -2365,7 +2365,7 @@ void MethodContext::recGetHelperFtn(CorInfoHelpFunc ftnNum, void** ppIndirection`
`2365`	`2365`	`DLDL oldValue = GetHelperFtn->Get(key);`
`2366`	`2366`
`2367`	`2367`	`AssertCodeMsg(oldValue.A == value.A && oldValue.B == oldValue.B, EXCEPTIONCODE_MC,`
`2368`		`- "collision! old: %016" PRIX64 " %016" PRIX64 ", new: %016" PRIX64 " %016" PRIX64 " \n", oldValue.A, oldValue.B, value.A,`
	`2368`	`+ "collision! old: %016" PRIX64 " %016" PRIX64 ", new: %016" PRIX64 " %016" PRIX64, oldValue.A, oldValue.B, value.A,`
`2369`	`2369`	`value.B);`
`2370`	`2370`	`}`
`2371`	`2371`