Fallback for enum.Format(G) when not valid (dotnet/coreclr#10610)

Commit migrated from https://github.com/dotnet/coreclr/commit/82e2735a477ffbfd7e8a67f5323c0c964da2a16f

diff --git a/src/coreclr/src/mscorlib/src/System/Enum.cs b/src/coreclr/src/mscorlib/src/System/Enum.cs
index 2403b6a..489f367 100644 (file)
--- a/src/coreclr/src/mscorlib/src/System/Enum.cs
+++ b/src/coreclr/src/mscorlib/src/System/Enum.cs
@@ -688,7 +688,7 @@ namespace System
 
             char formatCh = format[0];
             if (formatCh == 'G' || formatCh == 'g')
-                return GetEnumName(rtType, ToUInt64(value));
+                return GetEnumName(rtType, ToUInt64(value)) ?? value.ToString();
 
             if (formatCh == 'D' || formatCh == 'd')
                 return value.ToString();