Use alternative strategy to provide a (message, typeName) overload in Mono, while still avoiding changes to the Mono runtime code.

teo-tsirpanis · teo-tsirpanis · commit b924a6f0f4c1 · 2025-02-08T18:05:23.000+02:00
diff --git a/src/coreclr/System.Private.CoreLib/src/System/Reflection/TypeNameResolver.CoreCLR.cs b/src/coreclr/System.Private.CoreLib/src/System/Reflection/TypeNameResolver.CoreCLR.cs
@@ -213,8 +213,8 @@ internal static RuntimeType GetTypeReferencedByCustomAttribute(string typeName,
                     {
                         throw new TypeLoadException(assembly is null ?
                             SR.Format(SR.TypeLoad_ResolveType, escapedTypeName) :
-                            SR.Format(SR.TypeLoad_ResolveTypeFromAssembly, escapedTypeName, assembly.FullName))
-                        { TypeName = escapedTypeName };
+                            SR.Format(SR.TypeLoad_ResolveTypeFromAssembly, escapedTypeName, assembly.FullName),
+                            typeName: escapedTypeName);
                     }
                     return null;
                 }
@@ -246,8 +246,8 @@ internal static RuntimeType GetTypeReferencedByCustomAttribute(string typeName,
                     {
                         if (_throwOnError)
                         {
-                            throw new TypeLoadException(SR.Format(SR.TypeLoad_ResolveTypeFromAssembly, parsedName.FullName, runtimeAssembly.FullName))
-                            { TypeName = parsedName.FullName };
+                            throw new TypeLoadException(SR.Format(SR.TypeLoad_ResolveTypeFromAssembly, parsedName.FullName, runtimeAssembly.FullName),
+                                typeName: parsedName.FullName);
                         }
                         return null;
                     }
@@ -282,8 +282,8 @@ internal static RuntimeType GetTypeReferencedByCustomAttribute(string typeName,
                     if (_throwOnError)
                     {
                         throw new TypeLoadException(SR.Format(SR.TypeLoad_ResolveNestedType,
-                            nestedTypeNames[i], (i > 0) ? nestedTypeNames[i - 1] : TypeName.Unescape(escapedTypeName)))
-                        { TypeName = parsedName.FullName };
+                            nestedTypeNames[i], (i > 0) ? nestedTypeNames[i - 1] : TypeName.Unescape(escapedTypeName)),
+                            typeName: parsedName.FullName);
                     }
                     return null;
                 }
@@ -320,8 +320,8 @@ internal static RuntimeType GetTypeReferencedByCustomAttribute(string typeName,
 
             if (_throwOnError)
             {
-                throw new TypeLoadException(SR.Format(SR.TypeLoad_ResolveTypeFromAssembly, parsedName.FullName, (requestingAssembly ?? coreLib).FullName))
-                { TypeName = parsedName.FullName };
+                throw new TypeLoadException(SR.Format(SR.TypeLoad_ResolveTypeFromAssembly, parsedName.FullName, (requestingAssembly ?? coreLib).FullName),
+                    typeName: parsedName.FullName);
             }
 
             return null;
diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/TypeNameResolver.NativeAot.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/TypeNameResolver.NativeAot.cs
@@ -146,8 +146,8 @@ internal partial struct TypeNameResolver
                     {
                         throw new TypeLoadException(assembly is null ?
                             SR.Format(SR.TypeLoad_ResolveType, escapedTypeName) :
-                            SR.Format(SR.TypeLoad_ResolveTypeFromAssembly, escapedTypeName, assembly.FullName))
-                        { TypeNameResolver = escapedTypeName };
+                            SR.Format(SR.TypeLoad_ResolveTypeFromAssembly, escapedTypeName, assembly.FullName),
+                            typeName: escapedTypeName);
                     }
                     return null;
                 }
@@ -235,8 +235,8 @@ internal partial struct TypeNameResolver
                     if (_throwOnError)
                     {
                         throw new TypeLoadException(SR.Format(SR.TypeLoad_ResolveNestedType,
-                            nestedTypeNames[i], (i > 0) ? nestedTypeNames[i - 1] : TypeName.Unescape(escapedTypeName)));
-                        { TypeName = parsedName.FullName };
+                            nestedTypeNames[i], (i > 0) ? nestedTypeNames[i - 1] : TypeName.Unescape(escapedTypeName)),
+                            typeName: parsedName.FullName);
                     }
                     return null;
                 }
diff --git a/src/libraries/System.Private.CoreLib/src/System/TypeLoadException.cs b/src/libraries/System.Private.CoreLib/src/System/TypeLoadException.cs
@@ -29,6 +29,15 @@ public TypeLoadException(string? message, Exception? inner)
             HResult = HResults.COR_E_TYPELOAD;
         }
 
+#if !MONO
+        internal TypeLoadException(string message, string typeName)
+            : base(message)
+        {
+            HResult = HResults.COR_E_TYPELOAD;
+            _className = typeName;
+        }
+#endif
+
         public override string Message
         {
             get
@@ -38,13 +47,7 @@ public override string Message
             }
         }
 
-        public string TypeName
-        {
-            get => _className ?? string.Empty;
-            // This is an init-only property, because a (string message, string typeName) constructor
-            // would conflict with Mono's (string typeName, string assemblyName) constructor.
-            internal init => _className = value;
-        }
+        public string TypeName => _className ?? string.Empty;
 
         [Obsolete(Obsoletions.LegacyFormatterImplMessage, DiagnosticId = Obsoletions.LegacyFormatterImplDiagId, UrlFormat = Obsoletions.SharedUrlFormat)]
         [EditorBrowsable(EditorBrowsableState.Never)]
diff --git a/src/mono/System.Private.CoreLib/src/System/Reflection/TypeNameResolver.Mono.cs b/src/mono/System.Private.CoreLib/src/System/Reflection/TypeNameResolver.Mono.cs
@@ -115,8 +115,8 @@ internal unsafe ref partial struct TypeNameResolver
                     {
                         throw new TypeLoadException(assembly is null ?
                             SR.Format(SR.TypeLoad_ResolveType, escapedTypeName) :
-                            SR.Format(SR.TypeLoad_ResolveTypeFromAssembly, escapedTypeName, assembly.FullName))
-                        { TypeName = escapedTypeName };
+                            SR.Format(SR.TypeLoad_ResolveTypeFromAssembly, escapedTypeName, assembly.FullName),
+                            typeName: escapedTypeName);
                     }
                     return null;
                 }
@@ -160,8 +160,8 @@ internal unsafe ref partial struct TypeNameResolver
                     if (_throwOnError)
                     {
                         throw new TypeLoadException(SR.Format(SR.TypeLoad_ResolveNestedType,
-                            nestedTypeNames[i], (i > 0) ? nestedTypeNames[i - 1] : TypeName.Unescape(escapedTypeName)))
-                        { TypeName = parsedName.FullName };
+                            nestedTypeNames[i], (i > 0) ? nestedTypeNames[i - 1] : TypeName.Unescape(escapedTypeName)),
+                            typeName: escapedTypeName);
                     }
                     return null;
                 }
diff --git a/src/mono/System.Private.CoreLib/src/System/TypeLoadException.Mono.cs b/src/mono/System.Private.CoreLib/src/System/TypeLoadException.Mono.cs
@@ -13,6 +13,18 @@ internal TypeLoadException(string className, string assemblyName)
             _assemblyName = assemblyName;
         }
 
+        // Because the Mono runtime has a dependency to a (string, string) constructor overload,
+        // we add a dummy parameter with a default value to minimize native code changes.
+        // In order to use this overload, callers should either pass three arguments, or specify
+        // one of the parameters by name.
+        internal TypeLoadException(string message, string typeName, bool useMessageTypeNameOverload = true)
+            : base(message)
+        {
+            _ = useMessageTypeNameOverload;
+            HResult = HResults.COR_E_TYPELOAD;
+            _className = typeName;
+        }
+
         private void SetMessageField()
         {
             if (_message != null)

Original file line number	Diff line number	Diff line change
`@@ -213,8 +213,8 @@ internal static RuntimeType GetTypeReferencedByCustomAttribute(string typeName,`
`213`	`213`	`{`
`214`	`214`	`throw new TypeLoadException(assembly is null ?`
`215`	`215`	`SR.Format(SR.TypeLoad_ResolveType, escapedTypeName) :`
`216`		`- SR.Format(SR.TypeLoad_ResolveTypeFromAssembly, escapedTypeName, assembly.FullName))`
`217`		`- { TypeName = escapedTypeName };`
	`216`	`+ SR.Format(SR.TypeLoad_ResolveTypeFromAssembly, escapedTypeName, assembly.FullName),`
	`217`	`+ typeName: escapedTypeName);`
`218`	`218`	`}`
`219`	`219`	`return null;`
`220`	`220`	`}`
`@@ -246,8 +246,8 @@ internal static RuntimeType GetTypeReferencedByCustomAttribute(string typeName,`
`246`	`246`	`{`
`247`	`247`	`if (_throwOnError)`
`248`	`248`	`{`
`249`		`- throw new TypeLoadException(SR.Format(SR.TypeLoad_ResolveTypeFromAssembly, parsedName.FullName, runtimeAssembly.FullName))`
`250`		`- { TypeName = parsedName.FullName };`
	`249`	`+ throw new TypeLoadException(SR.Format(SR.TypeLoad_ResolveTypeFromAssembly, parsedName.FullName, runtimeAssembly.FullName),`
	`250`	`+ typeName: parsedName.FullName);`
`251`	`251`	`}`
`252`	`252`	`return null;`
`253`	`253`	`}`
`@@ -282,8 +282,8 @@ internal static RuntimeType GetTypeReferencedByCustomAttribute(string typeName,`
`282`	`282`	`if (_throwOnError)`
`283`	`283`	`{`
`284`	`284`	`throw new TypeLoadException(SR.Format(SR.TypeLoad_ResolveNestedType,`
`285`		`- nestedTypeNames[i], (i > 0) ? nestedTypeNames[i - 1] : TypeName.Unescape(escapedTypeName)))`
`286`		`- { TypeName = parsedName.FullName };`
	`285`	`+ nestedTypeNames[i], (i > 0) ? nestedTypeNames[i - 1] : TypeName.Unescape(escapedTypeName)),`
	`286`	`+ typeName: parsedName.FullName);`
`287`	`287`	`}`
`288`	`288`	`return null;`
`289`	`289`	`}`
`@@ -320,8 +320,8 @@ internal static RuntimeType GetTypeReferencedByCustomAttribute(string typeName,`
`320`	`320`
`321`	`321`	`if (_throwOnError)`
`322`	`322`	`{`
`323`		`- throw new TypeLoadException(SR.Format(SR.TypeLoad_ResolveTypeFromAssembly, parsedName.FullName, (requestingAssembly ?? coreLib).FullName))`
`324`		`- { TypeName = parsedName.FullName };`
	`323`	`+ throw new TypeLoadException(SR.Format(SR.TypeLoad_ResolveTypeFromAssembly, parsedName.FullName, (requestingAssembly ?? coreLib).FullName),`
	`324`	`+ typeName: parsedName.FullName);`
`325`	`325`	`}`
`326`	`326`
`327`	`327`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -146,8 +146,8 @@ internal partial struct TypeNameResolver`
`146`	`146`	`{`
`147`	`147`	`throw new TypeLoadException(assembly is null ?`
`148`	`148`	`SR.Format(SR.TypeLoad_ResolveType, escapedTypeName) :`
`149`		`- SR.Format(SR.TypeLoad_ResolveTypeFromAssembly, escapedTypeName, assembly.FullName))`
`150`		`- { TypeNameResolver = escapedTypeName };`
	`149`	`+ SR.Format(SR.TypeLoad_ResolveTypeFromAssembly, escapedTypeName, assembly.FullName),`
	`150`	`+ typeName: escapedTypeName);`
`151`	`151`	`}`
`152`	`152`	`return null;`
`153`	`153`	`}`
`@@ -235,8 +235,8 @@ internal partial struct TypeNameResolver`
`235`	`235`	`if (_throwOnError)`
`236`	`236`	`{`
`237`	`237`	`throw new TypeLoadException(SR.Format(SR.TypeLoad_ResolveNestedType,`
`238`		`- nestedTypeNames[i], (i > 0) ? nestedTypeNames[i - 1] : TypeName.Unescape(escapedTypeName)));`
`239`		`- { TypeName = parsedName.FullName };`
	`238`	`+ nestedTypeNames[i], (i > 0) ? nestedTypeNames[i - 1] : TypeName.Unescape(escapedTypeName)),`
	`239`	`+ typeName: parsedName.FullName);`
`240`	`240`	`}`
`241`	`241`	`return null;`
`242`	`242`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,8 +115,8 @@ internal unsafe ref partial struct TypeNameResolver`
`115`	`115`	`{`
`116`	`116`	`throw new TypeLoadException(assembly is null ?`
`117`	`117`	`SR.Format(SR.TypeLoad_ResolveType, escapedTypeName) :`
`118`		`- SR.Format(SR.TypeLoad_ResolveTypeFromAssembly, escapedTypeName, assembly.FullName))`
`119`		`- { TypeName = escapedTypeName };`
	`118`	`+ SR.Format(SR.TypeLoad_ResolveTypeFromAssembly, escapedTypeName, assembly.FullName),`
	`119`	`+ typeName: escapedTypeName);`
`120`	`120`	`}`
`121`	`121`	`return null;`
`122`	`122`	`}`
`@@ -160,8 +160,8 @@ internal unsafe ref partial struct TypeNameResolver`
`160`	`160`	`if (_throwOnError)`
`161`	`161`	`{`
`162`	`162`	`throw new TypeLoadException(SR.Format(SR.TypeLoad_ResolveNestedType,`
`163`		`- nestedTypeNames[i], (i > 0) ? nestedTypeNames[i - 1] : TypeName.Unescape(escapedTypeName)))`
`164`		`- { TypeName = parsedName.FullName };`
	`163`	`+ nestedTypeNames[i], (i > 0) ? nestedTypeNames[i - 1] : TypeName.Unescape(escapedTypeName)),`
	`164`	`+ typeName: escapedTypeName);`
`165`	`165`	`}`
`166`	`166`	`return null;`
`167`	`167`	`}`