fixup! Workaround for mono attribute bug

BadSingleton · BadSingleton · commit 1f9d221bb50d · 2022-07-18T11:35:33.000-04:00
don't try to derive from sealed types
diff --git a/src/runtime/StateSerialization/RuntimeData.cs b/src/runtime/StateSerialization/RuntimeData.cs
@@ -44,6 +44,7 @@ internal static class NonSerializedTypeBuilder
         private static Func<Type, bool> isNestedType = (tp) => hasVisibility(tp, TypeAttributes.NestedPrivate) || hasVisibility(tp, TypeAttributes.NestedPublic) || hasVisibility(tp, TypeAttributes.NestedFamily) || hasVisibility(tp, TypeAttributes.NestedAssembly);
         private static Func<Type, bool> isPrivateType = (tp) => hasVisibility(tp, TypeAttributes.NotPublic) || hasVisibility(tp, TypeAttributes.NestedPrivate) || hasVisibility(tp, TypeAttributes.NestedFamily) || hasVisibility( tp, TypeAttributes.NestedAssembly);
         private static Func<Type, bool> isPublicType = (tp) => hasVisibility(tp, TypeAttributes.Public) || hasVisibility(tp,TypeAttributes.NestedPublic);
+        private static Func<Type, bool> CanCreateType = (tp) => isPublicType(tp) && ((tp.Attributes & TypeAttributes.Sealed) == 0);
 
         public static object? CreateNewObject(Type baseType)
         {
@@ -108,7 +109,7 @@ static string MakeName(Type tp)
 
         public static Type? CreateType(Type tp)
         {
-            if (!isPublicType(tp))
+            if (!CanCreateType(tp))
             {
                 return null;
             }

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ internal static class NonSerializedTypeBuilder`
`44`	`44`	`private static Func<Type, bool> isNestedType = (tp) => hasVisibility(tp, TypeAttributes.NestedPrivate) \|\| hasVisibility(tp, TypeAttributes.NestedPublic) \|\| hasVisibility(tp, TypeAttributes.NestedFamily) \|\| hasVisibility(tp, TypeAttributes.NestedAssembly);`
`45`	`45`	`private static Func<Type, bool> isPrivateType = (tp) => hasVisibility(tp, TypeAttributes.NotPublic) \|\| hasVisibility(tp, TypeAttributes.NestedPrivate) \|\| hasVisibility(tp, TypeAttributes.NestedFamily) \|\| hasVisibility( tp, TypeAttributes.NestedAssembly);`
`46`	`46`	`private static Func<Type, bool> isPublicType = (tp) => hasVisibility(tp, TypeAttributes.Public) \|\| hasVisibility(tp,TypeAttributes.NestedPublic);`
	`47`	`+ private static Func<Type, bool> CanCreateType = (tp) => isPublicType(tp) && ((tp.Attributes & TypeAttributes.Sealed) == 0);`
`47`	`48`
`48`	`49`	`public static object? CreateNewObject(Type baseType)`
`49`	`50`	`{`
`@@ -108,7 +109,7 @@ static string MakeName(Type tp)`
`108`	`109`
`109`	`110`	`public static Type? CreateType(Type tp)`
`110`	`111`	`{`
`111`		`- if (!isPublicType(tp))`
	`112`	`+ if (!CanCreateType(tp))`
`112`	`113`	`{`
`113`	`114`	`return null;`
`114`	`115`	`}`