Stop rooting nested types for helper types

microsoft · Mar 18, 2024 · a6ba167 · a6ba167
1 parent dc4610e
commit a6ba167
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 26 deletions.
diff --git a/src/WinRT.Runtime/ApiCompatBaseline.txt b/src/WinRT.Runtime/ApiCompatBaseline.txt
@@ -21,4 +21,5 @@ CannotRemoveAttribute : Attribute 'WinRT.ObjectReferenceWrapperAttribute' exists
 CannotRemoveAttribute : Attribute 'WinRT.ObjectReferenceWrapperAttribute' exists on 'WinRT.IInspectable' in the contract but not the implementation.
 MembersMustExist : Member 'protected void Microsoft.UI.Xaml.LayoutCycleException..ctor(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'protected void Microsoft.UI.Xaml.Automation.ElementNotAvailableException..ctor(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)' does not exist in the implementation but it does exist in the contract.
-Total Issues: 122
+CannotChangeAttribute : Attribute 'System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute' on 'WinRT.WindowsRuntimeHelperTypeAttribute.HelperType' changed from '[DynamicallyAccessedMembersAttribute(DynamicallyAccessedMemberTypes.PublicFields | DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.PublicNestedTypes)]' in the contract to '[DynamicallyAccessedMembersAttribute(DynamicallyAccessedMemberTypes.PublicFields | DynamicallyAccessedMemberTypes.PublicMethods)]' in the implementation.
+Total Issues: 123
diff --git a/src/WinRT.Runtime/Attributes.cs b/src/WinRT.Runtime/Attributes.cs
@@ -97,15 +97,15 @@ public WindowsRuntimeHelperTypeAttribute()
 
  public WindowsRuntimeHelperTypeAttribute(
 #if NET
- [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.PublicNestedTypes | DynamicallyAccessedMemberTypes.PublicFields)]
+ [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.PublicFields)]
 #endif
  Type helperType)
  {
  HelperType = helperType;
  }
 
 #if NET
- [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.PublicNestedTypes | DynamicallyAccessedMemberTypes.PublicFields)]
+ [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.PublicFields)]
 #endif
  public Type HelperType { get; }
  }

diff --git a/src/WinRT.Runtime/ComWrappersSupport.cs b/src/WinRT.Runtime/ComWrappersSupport.cs
@@ -159,7 +159,6 @@ public static void RegisterHelperType(
  Type type,
 #if NET
  [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods |
- DynamicallyAccessedMemberTypes.PublicNestedTypes |
  DynamicallyAccessedMemberTypes.PublicFields)]
 #endif
  Type helperType) => TypeExtensions.HelperTypeCache.TryAdd(type, helperType);

diff --git a/src/WinRT.Runtime/Marshalers.cs b/src/WinRT.Runtime/Marshalers.cs
@@ -1375,15 +1375,13 @@ struct MarshalInterface<T>
 #if NET
  [DynamicallyAccessedMembers(
  DynamicallyAccessedMemberTypes.PublicFields |
- DynamicallyAccessedMemberTypes.PublicNestedTypes |
  DynamicallyAccessedMemberTypes.PublicMethods)]
 #endif
  private static Type _HelperType;
 
 #if NET
  [DynamicallyAccessedMembers(
  DynamicallyAccessedMemberTypes.PublicFields |
- DynamicallyAccessedMemberTypes.PublicNestedTypes |
  DynamicallyAccessedMemberTypes.PublicMethods)]
 #endif
  private static Type HelperType => _HelperType ??= typeof(T).GetHelperType();

diff --git a/src/WinRT.Runtime/MatchingRefApiCompatBaseline.txt b/src/WinRT.Runtime/MatchingRefApiCompatBaseline.txt
@@ -211,4 +211,5 @@ TypesMustExist : Type 'WinRT.WinRTExposedTypeAttribute' does not exist in the re
 TypesMustExist : Type 'WinRT.WinRTImplementationTypeRcwFactoryAttribute' does not exist in the reference but it does exist in the implementation.
 CannotRemoveAttribute : Attribute 'System.ObsoleteAttribute' exists on 'System.Type WinRT.Marshaler<T>.RefAbiType' in the implementation but not the reference.
 TypesMustExist : Type 'WinRT.Interop.IID' does not exist in the reference but it does exist in the implementation.
-Total Issues: 213
+CannotChangeAttribute : Attribute 'System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute' on 'WinRT.WindowsRuntimeHelperTypeAttribute.HelperType' changed from '[DynamicallyAccessedMembersAttribute(DynamicallyAccessedMemberTypes.PublicFields | DynamicallyAccessedMemberTypes.PublicMethods)]' in the implementation to '[DynamicallyAccessedMembersAttribute(DynamicallyAccessedMemberTypes.PublicFields | DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.PublicNestedTypes)]' in the reference.
+Total Issues: 214
diff --git a/src/WinRT.Runtime/Projections.cs b/src/WinRT.Runtime/Projections.cs
@@ -120,7 +120,6 @@ private static void RegisterCustomAbiTypeMapping(
 #if NET
  [DynamicallyAccessedMembers(
  DynamicallyAccessedMemberTypes.PublicMethods |
- DynamicallyAccessedMemberTypes.PublicNestedTypes |
  DynamicallyAccessedMemberTypes.PublicFields)]
 #endif
  Type abiType, 
@@ -143,7 +142,6 @@ private static void RegisterCustomTypeToHelperTypeMapping(
 #if NET
  [DynamicallyAccessedMembers(
  DynamicallyAccessedMemberTypes.PublicMethods |
- DynamicallyAccessedMemberTypes.PublicNestedTypes |
  DynamicallyAccessedMemberTypes.PublicFields)]
 #endif
  Type helperType)
@@ -164,7 +162,6 @@ private static void RegisterCustomTypeToHelperTypeMappingNoLock(
 #if NET
  [DynamicallyAccessedMembers(
  DynamicallyAccessedMemberTypes.PublicMethods |
- DynamicallyAccessedMemberTypes.PublicNestedTypes |
  DynamicallyAccessedMemberTypes.PublicFields)]
 #endif
  Type helperType)
@@ -177,7 +174,6 @@ private static void RegisterCustomAbiTypeMappingNoLock(
 #if NET
  [DynamicallyAccessedMembers(
  DynamicallyAccessedMemberTypes.PublicMethods |
- DynamicallyAccessedMemberTypes.PublicNestedTypes |
  DynamicallyAccessedMemberTypes.PublicFields)]
 #endif
  Type abiType, 
@@ -200,7 +196,6 @@ private static void RegisterCustomAbiTypeMapping(
 #if NET
  [DynamicallyAccessedMembers(
  DynamicallyAccessedMemberTypes.PublicMethods |
- DynamicallyAccessedMemberTypes.PublicNestedTypes |
  DynamicallyAccessedMemberTypes.PublicFields)]
 #endif
  Type abiType)
@@ -221,7 +216,6 @@ private static void RegisterCustomAbiTypeMappingNoLock(
 #if NET
  [DynamicallyAccessedMembers(
  DynamicallyAccessedMemberTypes.PublicMethods |
- DynamicallyAccessedMemberTypes.PublicNestedTypes |
  DynamicallyAccessedMemberTypes.PublicFields)]
 #endif
  Type abiType)
@@ -233,7 +227,6 @@ private static void RegisterCustomAbiTypeMappingNoLock(
 #if NET
  [return: DynamicallyAccessedMembers(
  DynamicallyAccessedMemberTypes.PublicMethods |
- DynamicallyAccessedMemberTypes.PublicNestedTypes |
  DynamicallyAccessedMemberTypes.PublicFields)]
 #endif
  public static Type FindCustomHelperTypeMapping(Type publicType, bool filterToRuntimeClass = false)

diff --git a/src/WinRT.Runtime/TypeExtensions.cs b/src/WinRT.Runtime/TypeExtensions.cs
@@ -21,15 +21,13 @@ static class TypeExtensions
 
 #if NET
  [return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods |
- DynamicallyAccessedMemberTypes.PublicNestedTypes | 
  DynamicallyAccessedMemberTypes.PublicFields)]
  [SuppressMessage("Trimming", "IL2073", Justification = "Matching trimming annotations are used at all callsites registering helper types present in the cache.")]
 #endif
  public static Type FindHelperType(this Type type)
  {
 #if NET
  [return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods |
- DynamicallyAccessedMemberTypes.PublicNestedTypes |
  DynamicallyAccessedMemberTypes.PublicFields)]
 #endif
  static Type FindHelperTypeNoCache(Type type)
@@ -76,7 +74,7 @@ static Type FindHelperTypeNoCache(Type type)
 #if NET
  [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2026:RequiresUnreferencedCode",
  Justification = "No members of the generic type are dynamically accessed other than for the attributes on it.")]
- [return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.PublicNestedTypes | DynamicallyAccessedMemberTypes.PublicFields)]
+ [return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.PublicFields)]
 #endif
  static Type GetHelperTypeFromAttribute(WindowsRuntimeHelperTypeAttribute helperTypeAtribute, Type type)
  {
@@ -119,8 +117,7 @@ static Type FindHelperTypeFallback(Type type)
  }
 
 #if NET
- [return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | 
- DynamicallyAccessedMemberTypes.PublicNestedTypes |
+ [return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods |
  DynamicallyAccessedMemberTypes.PublicFields)]
 #endif
  public static Type GetHelperType(this Type type)
@@ -140,13 +137,9 @@ public static Type GetGuidType(this Type type)
  }
 
 #if NET
- [return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)]
-#endif
- public static Type FindVftblType(
-#if NET
- [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicNestedTypes)]
+ [SuppressMessage("Trimming", "IL2070", Justification = "The fallback path is not trim-safe by design (to avoid annotations).")]
 #endif
-  this Type helperType)
+ public static Type FindVftblType(this Type helperType)
  {
 #if NET
  if (!RuntimeFeature.IsDynamicCodeCompiled)
@@ -169,9 +162,12 @@ public static Type FindVftblType(
  return vftblType;
  }
 
+#if NET
+ [SuppressMessage("Trimming", "IL2075", Justification = "The path using vtable types is a fallback and is not trim-safe by design.")]
+#endif
  internal static IntPtr GetAbiToProjectionVftblPtr(
 #if NET
- [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields | DynamicallyAccessedMemberTypes.PublicNestedTypes)]
+ [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)]
 #endif
  this Type helperType)
  {