Debug: Do not trigger string cctor in Debug.Assert if it's unnecessary

This patch fixes crashes due to ClassConstructorRunner.EnsureClassConstructorRun is called before ClassConstructorRunner.Initialize.
dotnet · Dec 3, 2018 · 61683d6 · 61683d6
1 parent f9a0aae
commit 61683d6
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/System.Private.CoreLib/shared/System/Diagnostics/Debug.cs b/src/System.Private.CoreLib/shared/System/Diagnostics/Debug.cs
@@ -87,13 +87,23 @@ public static void Print(string format, params object[] args)
         [System.Diagnostics.Conditional("DEBUG")]
         public static void Assert(bool condition)
         {
-            Assert(condition, string.Empty, string.Empty);
+            // Do not trigger string cctor if it's unnecessary otherwise we can call ClassConstructorRunner.EnsureClassConstructorRun
+            // before ClassConstructorRunner.Initialize is called.
+            if (!condition)
+            {
+                Assert(condition, string.Empty, string.Empty);
+            }
         }
 
         [System.Diagnostics.Conditional("DEBUG")]
         public static void Assert(bool condition, string message)
         {
-            Assert(condition, message, string.Empty);
+            // Do not trigger string cctor if it's unnecessary otherwise we can call ClassConstructorRunner.EnsureClassConstructorRun
+            // before ClassConstructorRunner.Initialize is called.
+            if (!condition)
+            {
+                Assert(condition, message, string.Empty);
+            }
         }
 
         [System.Diagnostics.Conditional("DEBUG")]