Check for V2 shapes on string marshallers (dotnet#71730)

doorxp · Jul 6, 2022 · 3d0a8bc · 3d0a8bc
1 parent 6d384fc
commit 3d0a8bc
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/...untime.InteropServices/gen/Microsoft.Interop.SourceGeneration/MarshallingAttributeInfo.cs b/...untime.InteropServices/gen/Microsoft.Interop.SourceGeneration/MarshallingAttributeInfo.cs
@@ -737,7 +737,7 @@ private MarshallingInfo CreateNativeMarshallingInfo_V1(
                     GetMarshallingInfo(elementType, useSiteAttributes, indirectionLevel + 1, inspectedElements, ref maxIndirectionDepthUsed));
             }
 
-            return CreateNativeMarshallingInfoForValue(
+            return CreateNativeMarshallingInfoForValue_V1(
                 type,
                 nativeType,
                 attrData,
@@ -746,7 +746,7 @@ private MarshallingInfo CreateNativeMarshallingInfo_V1(
                 useDefaultMarshalling: !isMarshalUsingAttribute);
         }
 
-        private MarshallingInfo CreateNativeMarshallingInfoForValue(
+        private MarshallingInfo CreateNativeMarshallingInfoForValue_V1(
             ITypeSymbol type,
             INamedTypeSymbol nativeType,
             AttributeData attrData,
@@ -974,10 +974,21 @@ private MarshallingInfo CreateStringMarshallingInfo(
             if (stringMarshaller is null)
                 return new MissingSupportMarshallingInfo();
 
+            if (ManualTypeMarshallingHelper.HasEntryPointMarshallerAttribute(stringMarshaller))
+            {
+                if (ManualTypeMarshallingHelper.TryGetValueMarshallersFromEntryType(stringMarshaller, type, _compilation, out CustomTypeMarshallers? marshallers))
+                {
+                    return new NativeMarshallingAttributeInfo(
+                        EntryPointType: ManagedTypeInfo.CreateTypeInfoForTypeSymbol(stringMarshaller),
+                        Marshallers: marshallers.Value,
+                        IsPinnableManagedType: false);
+                }
+            }
+
             var (_, _, customTypeMarshallerData) = ManualTypeMarshallingHelper_V1.GetMarshallerShapeInfo(stringMarshaller);
             Debug.Assert(customTypeMarshallerData is not null);
 
-            return CreateNativeMarshallingInfoForValue(
+            return CreateNativeMarshallingInfoForValue_V1(
                 type,
                 stringMarshaller,
                 null,