Update decompiler submodule

dnSpyEx · Jul 14, 2023 · 395322f · 395322f
1 parent 928b57b
commit 395322f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/Extensions/ILSpy.Decompiler/ICSharpCode.Decompiler b/Extensions/ILSpy.Decompiler/ICSharpCode.Decompiler
diff --git a/dnSpy/dnSpy.Contracts.Logic/Decompiler/Extensions.cs b/dnSpy/dnSpy.Contracts.Logic/Decompiler/Extensions.cs
@@ -254,14 +254,16 @@ public static bool IsIndexer(this PropertyDef? property) {
 			return false;
 		}
 
-		static string? GetDefaultMemberName(TypeDef type) {
+		static string? GetDefaultMemberName(TypeDef? type) {
 			if (type is null)
 				return null;
 			foreach (var ca in type.CustomAttributes.FindAll("System.Reflection.DefaultMemberAttribute")) {
 				if (ca.Constructor is not null && ca.Constructor.FullName == @"System.Void System.Reflection.DefaultMemberAttribute::.ctor(System.String)" &&
-					ca.ConstructorArguments.Count == 1 &&
-					ca.ConstructorArguments[0].Value is UTF8String) {
-					return (UTF8String)ca.ConstructorArguments[0].Value;
+					ca.ConstructorArguments.Count == 1) {
+					var value = ca.ConstructorArguments[0].Value;
+					var memberName = (value as UTF8String)?.String ?? value as string;
+					if (memberName is not null)
+						return memberName;
 				}
 			}
 			return null;