[release/6.0] Use custom error message when running out of syncblocks (…

…#60592) * Use custom error message when running out of syncblocks Contributes to #49215 * Update src/coreclr/dlls/mscorrc/mscorrc.rc update message Co-authored-by: Jan Kotas <[email protected]> Co-authored-by: Jan Kotas <[email protected]> Co-authored-by: Manish Godse <[email protected]>
dotnet · Oct 19, 2021 · 0879ce8 · 0879ce8
1 parent dd936c6
commit 0879ce8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/src/coreclr/dlls/mscorrc/mscorrc.rc b/src/coreclr/dlls/mscorrc/mscorrc.rc
@@ -496,6 +496,7 @@ BEGIN
 
     IDS_EE_ARRAY_DIMENSIONS_EXCEEDED        "Array dimensions exceeded supported range."
 
+    IDS_EE_OUT_OF_SYNCBLOCKS                "Internal limitation: attempt to create more than 2^26 SyncBlocks."
 
     IDS_EE_THREAD_NOTSTARTED                "Thread has not been started."
     IDS_EE_STRING_TOOLONG                   "Marshaler restriction: Excessively long string."

diff --git a/src/coreclr/dlls/mscorrc/resource.h b/src/coreclr/dlls/mscorrc/resource.h
@@ -369,6 +369,7 @@
 #define IDS_EE_COMIMPORT_METHOD_NO_INTERFACE    0x1aab
 #define IDS_EE_OUT_OF_MEMORY_WITHIN_RANGE       0x1aac
 #define IDS_EE_ARRAY_DIMENSIONS_EXCEEDED        0x1aad
+#define IDS_EE_OUT_OF_SYNCBLOCKS                0x1aae
 
 #define IDS_CLASSLOAD_MI_CANNOT_OVERRIDE        0x1ab3
 #define IDS_CLASSLOAD_COLLECTIBLEFIXEDVTATTR    0x1ab6

diff --git a/src/coreclr/vm/syncblk.cpp b/src/coreclr/vm/syncblk.cpp
@@ -840,7 +840,7 @@ void SyncBlockCache::Grow()
 
     if (!(newSyncTableSize > m_SyncTableSize)) // Make sure we actually found room to grow!
     {
-        COMPlusThrowOM();
+        EX_THROW(EEMessageException, (kOutOfMemoryException, IDS_EE_OUT_OF_SYNCBLOCKS));
     }
 
     newSyncTable = new SyncTableEntry[newSyncTableSize];