Fix formatting string for assembly MVID mismatch (#50474)

During development of the MVID check change I at some point ended up with mismatched printf specifiers and arguments. This change fixes this inconsistency. Thanks Tomas
dotnet · Apr 2, 2021 · fc9faf2 · fc9faf2
1 parent c24bf80
commit fc9faf2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/coreclr/inc/CrstTypes.def b/src/coreclr/inc/CrstTypes.def
@@ -86,7 +86,7 @@ Crst ArgBasedStubCache
 End
 
 Crst AssemblyLoader
- AcquiredBefore DeadlockDetection UniqueStack
+ AcquiredBefore DeadlockDetection UniqueStack DebuggerMutex
 End
 
 Crst AvailableClass

diff --git a/src/coreclr/inc/crsttypes.h b/src/coreclr/inc/crsttypes.h
@@ -149,7 +149,7 @@ int g_rgCrstLevelMap[] =
  14, // CrstAppDomainHandleTable
  0, // CrstArgBasedStubCache
  0, // CrstAssemblyList
- 7,  // CrstAssemblyLoader
+ 12, // CrstAssemblyLoader
  3, // CrstAvailableClass
  4, // CrstAvailableParamTypes
  7, // CrstBaseDomain

diff --git a/src/coreclr/vm/nativeimage.cpp b/src/coreclr/vm/nativeimage.cpp
@@ -286,7 +286,7 @@ void NativeImage::CheckAssemblyMvid(Assembly *assembly) const
 
  SString message;
  message.Printf(W("MVID mismatch between loaded assembly '%s' (MVID = %s) and an assembly with the same simple name embedded in the native image '%s' (MVID = %s)"),
- assembly->GetSimpleName(),
+ SString(SString::Utf8, assembly->GetSimpleName()).GetUnicode(),
  assemblyMvidText,
  SString(SString::Utf8, GetFileName()).GetUnicode(),
  componentMvidText);