Skip to content

Commit ff279ba

Browse files
MichalStrehovskyCopilotjkotas
authored
Enable DisabledRuntimeMarshalling tests on native AOT (#130160)
These were already passing. One wasn't and it still doesn't, but that's mostly by design. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Jan Kotas <jkotas@microsoft.com>
1 parent 8f365c9 commit ff279ba

13 files changed

Lines changed: 154 additions & 145 deletions

File tree

‎src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4636,29 +4636,32 @@ private uint getJitFlags(ref CORJIT_FLAGS flags, uint sizeInBytes)
46364636

46374637
if (this.MethodBeingCompiled.IsUnmanagedCallersOnly)
46384638
{
4639+
#if READYTORUN
4640+
const bool isFallbackBodyCompilation = false;
4641+
#else
4642+
bool isFallbackBodyCompilation = _isFallbackBodyCompilation;
4643+
#endif
4644+
46394645
// Validate UnmanagedCallersOnlyAttribute usage
4640-
if (!this.MethodBeingCompiled.Signature.IsStatic) // Must be a static method
4646+
if (!isFallbackBodyCompilation && !this.MethodBeingCompiled.Signature.IsStatic) // Must be a static method
46414647
{
46424648
ThrowHelper.ThrowInvalidProgramException(ExceptionStringID.InvalidProgramNonStaticMethod, this.MethodBeingCompiled);
46434649
}
46444650

4645-
if (this.MethodBeingCompiled.HasInstantiation || this.MethodBeingCompiled.OwningType.HasInstantiation) // No generics involved
4651+
if (!isFallbackBodyCompilation && (this.MethodBeingCompiled.HasInstantiation || this.MethodBeingCompiled.OwningType.HasInstantiation)) // No generics involved
46464652
{
46474653
ThrowHelper.ThrowInvalidProgramException(ExceptionStringID.InvalidProgramGenericMethod, this.MethodBeingCompiled);
46484654
}
46494655

4650-
if (this.MethodBeingCompiled.IsAsync)
4656+
if (!isFallbackBodyCompilation && this.MethodBeingCompiled.IsAsync)
46514657
{
46524658
ThrowHelper.ThrowInvalidProgramException(ExceptionStringID.InvalidProgramAsync, this.MethodBeingCompiled);
46534659
}
46544660

4655-
#if READYTORUN
4656-
// TODO: enable this check in full AOT
4657-
if (Marshaller.IsMarshallingRequired(this.MethodBeingCompiled.Signature, ((MetadataType)this.MethodBeingCompiled.OwningType).Module, this.MethodBeingCompiled.GetUnmanagedCallersOnlyMethodCallingConventions())) // Only blittable arguments
4661+
if (!isFallbackBodyCompilation && MarshalHelpers.IsMarshallingRequired(this.MethodBeingCompiled.Signature, ((MetadataType)this.MethodBeingCompiled.OwningType).Module)) // Only blittable arguments
46584662
{
46594663
ThrowHelper.ThrowInvalidProgramException(ExceptionStringID.InvalidProgramNonBlittableTypes, this.MethodBeingCompiled);
46604664
}
4661-
#endif
46624665

46634666
flags.Set(CorJitFlag.CORJIT_FLAG_REVERSE_PINVOKE);
46644667
}

‎src/coreclr/tools/Common/TypeSystem/Interop/IL/MarshalHelpers.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -971,5 +971,10 @@ public static bool IsRuntimeMarshallingEnabled(ModuleDesc module)
971971
{
972972
return module.Assembly is not EcmaAssembly assembly || !assembly.HasAssemblyCustomAttribute("System.Runtime.CompilerServices", "DisableRuntimeMarshallingAttribute");
973973
}
974+
975+
public static bool IsMarshallingRequired(MethodSignature methodSig, ModuleDesc moduleContext)
976+
{
977+
return Marshaller.IsMarshallingRequired(methodSig, moduleContext);
978+
}
974979
}
975980
}

‎src/coreclr/tools/Common/TypeSystem/Interop/IL/Marshaller.cs‎

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,137 @@ private static bool IsMarshallingRequired(MarshallerKind kind)
384384
return true;
385385
}
386386

387+
private static Marshaller[] GetMarshallers(
388+
MethodSignature methodSig,
389+
PInvokeFlags flags,
390+
ParameterMetadata[] parameterMetadataArray,
391+
bool runtimeMarshallingEnabled)
392+
{
393+
Marshaller[] marshallers = new Marshaller[methodSig.Length + 1];
394+
395+
for (int i = 0, parameterIndex = 0; i < marshallers.Length; i++)
396+
{
397+
Debug.Assert(parameterIndex == parameterMetadataArray.Length || i <= parameterMetadataArray[parameterIndex].Index);
398+
399+
ParameterMetadata parameterMetadata;
400+
if (parameterIndex == parameterMetadataArray.Length || i < parameterMetadataArray[parameterIndex].Index)
401+
{
402+
// if we don't have metadata for the parameter, create a dummy one
403+
parameterMetadata = new ParameterMetadata(i, ParameterMetadataAttributes.None, null);
404+
}
405+
else
406+
{
407+
Debug.Assert(i == parameterMetadataArray[parameterIndex].Index);
408+
parameterMetadata = parameterMetadataArray[parameterIndex++];
409+
}
410+
411+
TypeDesc parameterType = (i == 0) ? methodSig.ReturnType : methodSig[i - 1]; //first item is the return type
412+
if (runtimeMarshallingEnabled)
413+
{
414+
marshallers[i] = CreateMarshaller(parameterType,
415+
parameterIndex,
416+
methodSig.GetEmbeddedSignatureData(),
417+
MarshallerType.Argument,
418+
parameterMetadata.MarshalAsDescriptor,
419+
MarshalDirection.Forward,
420+
marshallers,
421+
#if !READYTORUN
422+
null,
423+
#endif
424+
parameterMetadata.Index,
425+
flags,
426+
parameterMetadata.In,
427+
parameterMetadata.Out,
428+
parameterMetadata.Return);
429+
}
430+
else
431+
{
432+
marshallers[i] = CreateDisabledMarshaller(
433+
parameterType,
434+
MarshallerType.Argument,
435+
MarshalDirection.Forward,
436+
marshallers,
437+
parameterMetadata.Index,
438+
flags,
439+
parameterMetadata.Return);
440+
}
441+
}
442+
443+
return marshallers;
444+
}
445+
446+
public static Marshaller[] GetMarshallersForMethod(MethodDesc targetMethod)
447+
{
448+
Debug.Assert(targetMethod.IsPInvoke);
449+
return GetMarshallers(
450+
targetMethod.Signature,
451+
targetMethod.GetPInvokeMethodMetadata().Flags,
452+
targetMethod.GetParameterMetadata(),
453+
MarshalHelpers.IsRuntimeMarshallingEnabled(((MetadataType)targetMethod.OwningType).Module));
454+
}
455+
456+
public static Marshaller[] GetMarshallersForSignature(MethodSignature methodSig, ParameterMetadata[] paramMetadata, ModuleDesc moduleContext)
457+
{
458+
return GetMarshallers(
459+
methodSig,
460+
new PInvokeFlags(PInvokeAttributes.None),
461+
paramMetadata,
462+
MarshalHelpers.IsRuntimeMarshallingEnabled(moduleContext));
463+
}
464+
465+
public static bool IsMarshallingRequired(MethodDesc targetMethod)
466+
{
467+
Debug.Assert(targetMethod.IsPInvoke);
468+
469+
if (targetMethod.IsUnmanagedCallersOnly)
470+
return true;
471+
472+
PInvokeMetadata metadata = targetMethod.GetPInvokeMethodMetadata();
473+
PInvokeFlags flags = metadata.Flags;
474+
475+
if (flags.SetLastError)
476+
return true;
477+
478+
if (!flags.PreserveSig)
479+
return true;
480+
481+
if (MarshalHelpers.ShouldCheckForPendingException(targetMethod.Context.Target, metadata))
482+
return true;
483+
484+
var marshallers = GetMarshallersForMethod(targetMethod);
485+
for (int i = 0; i < marshallers.Length; i++)
486+
{
487+
if (marshallers[i].IsMarshallingRequired())
488+
return true;
489+
}
490+
491+
return false;
492+
}
493+
494+
public static bool IsMarshallingRequired(MethodSignature methodSig, ModuleDesc moduleContext)
495+
{
496+
Marshaller[] marshallers = GetMarshallersForSignature(methodSig, Array.Empty<ParameterMetadata>(), moduleContext);
497+
for (int i = 0; i < marshallers.Length; i++)
498+
{
499+
if (marshallers[i].IsMarshallingRequired())
500+
return true;
501+
}
502+
503+
return false;
504+
}
505+
506+
public static bool IsMarshallingRequired(MethodSignature methodSig, ParameterMetadata[] paramMetadata, ModuleDesc moduleContext)
507+
{
508+
Marshaller[] marshallers = GetMarshallersForSignature(methodSig, paramMetadata, moduleContext);
509+
for (int i = 0; i < marshallers.Length; i++)
510+
{
511+
if (marshallers[i].IsMarshallingRequired())
512+
return true;
513+
}
514+
515+
return false;
516+
}
517+
387518
public bool IsMarshallingRequired()
388519
{
389520
return Out || IsManagedByRef || IsMarshallingRequired(MarshallerKind);

‎src/coreclr/tools/aot/ILCompiler.ReadyToRun/Interop/IL/Marshaller.ReadyToRun.cs‎

Lines changed: 0 additions & 129 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4-
using Debug = System.Diagnostics.Debug;
5-
64
namespace Internal.TypeSystem.Interop
75
{
86
partial class Marshaller
@@ -26,132 +24,5 @@ protected static Marshaller CreateMarshaller(MarshallerKind kind)
2624
}
2725
}
2826

29-
private static Marshaller[] GetMarshallers(
30-
MethodSignature methodSig,
31-
PInvokeFlags flags,
32-
ParameterMetadata[] parameterMetadataArray,
33-
bool runtimeMarshallingEnabled)
34-
{
35-
Marshaller[] marshallers = new Marshaller[methodSig.Length + 1];
36-
37-
for (int i = 0, parameterIndex = 0; i < marshallers.Length; i++)
38-
{
39-
Debug.Assert(parameterIndex == parameterMetadataArray.Length || i <= parameterMetadataArray[parameterIndex].Index);
40-
41-
ParameterMetadata parameterMetadata;
42-
if (parameterIndex == parameterMetadataArray.Length || i < parameterMetadataArray[parameterIndex].Index)
43-
{
44-
// if we don't have metadata for the parameter, create a dummy one
45-
parameterMetadata = new ParameterMetadata(i, ParameterMetadataAttributes.None, null);
46-
}
47-
else
48-
{
49-
Debug.Assert(i == parameterMetadataArray[parameterIndex].Index);
50-
parameterMetadata = parameterMetadataArray[parameterIndex++];
51-
}
52-
53-
TypeDesc parameterType = (i == 0) ? methodSig.ReturnType : methodSig[i - 1]; //first item is the return type
54-
if (runtimeMarshallingEnabled)
55-
{
56-
marshallers[i] = CreateMarshaller(parameterType,
57-
parameterIndex,
58-
methodSig.GetEmbeddedSignatureData(),
59-
MarshallerType.Argument,
60-
parameterMetadata.MarshalAsDescriptor,
61-
MarshalDirection.Forward,
62-
marshallers,
63-
parameterMetadata.Index,
64-
flags,
65-
parameterMetadata.In,
66-
parameterMetadata.Out,
67-
parameterMetadata.Return);
68-
}
69-
else
70-
{
71-
marshallers[i] = CreateDisabledMarshaller(
72-
parameterType,
73-
MarshallerType.Argument,
74-
MarshalDirection.Forward,
75-
marshallers,
76-
parameterMetadata.Index,
77-
flags,
78-
parameterMetadata.Return);
79-
}
80-
}
81-
82-
return marshallers;
83-
}
84-
85-
public static Marshaller[] GetMarshallersForMethod(MethodDesc targetMethod)
86-
{
87-
Debug.Assert(targetMethod.IsPInvoke);
88-
return GetMarshallers(
89-
targetMethod.Signature,
90-
targetMethod.GetPInvokeMethodMetadata().Flags,
91-
targetMethod.GetParameterMetadata(),
92-
MarshalHelpers.IsRuntimeMarshallingEnabled(((MetadataType)targetMethod.OwningType).Module));
93-
}
94-
95-
public static Marshaller[] GetMarshallersForSignature(MethodSignature methodSig, ParameterMetadata[] paramMetadata, ModuleDesc moduleContext)
96-
{
97-
return GetMarshallers(
98-
methodSig,
99-
new PInvokeFlags(PInvokeAttributes.None),
100-
paramMetadata,
101-
MarshalHelpers.IsRuntimeMarshallingEnabled(moduleContext));
102-
}
103-
104-
public static bool IsMarshallingRequired(MethodDesc targetMethod)
105-
{
106-
Debug.Assert(targetMethod.IsPInvoke);
107-
108-
if (targetMethod.IsUnmanagedCallersOnly)
109-
return true;
110-
111-
PInvokeMetadata metadata = targetMethod.GetPInvokeMethodMetadata();
112-
PInvokeFlags flags = metadata.Flags;
113-
114-
if (flags.SetLastError)
115-
return true;
116-
117-
if (!flags.PreserveSig)
118-
return true;
119-
120-
if (MarshalHelpers.ShouldCheckForPendingException(targetMethod.Context.Target, metadata))
121-
return true;
122-
123-
var marshallers = GetMarshallersForMethod(targetMethod);
124-
for (int i = 0; i < marshallers.Length; i++)
125-
{
126-
if (marshallers[i].IsMarshallingRequired())
127-
return true;
128-
}
129-
130-
return false;
131-
}
132-
133-
public static bool IsMarshallingRequired(MethodSignature methodSig, ModuleDesc moduleContext, UnmanagedCallingConventions callingConvention)
134-
{
135-
Marshaller[] marshallers = GetMarshallersForSignature(methodSig, System.Array.Empty<ParameterMetadata>(), moduleContext);
136-
for (int i = 0; i < marshallers.Length; i++)
137-
{
138-
if (marshallers[i].IsMarshallingRequired())
139-
return true;
140-
}
141-
142-
return false;
143-
}
144-
145-
public static bool IsMarshallingRequired(MethodSignature methodSig, ParameterMetadata[] paramMetadata, ModuleDesc moduleContext)
146-
{
147-
Marshaller[] marshallers = GetMarshallersForSignature(methodSig, paramMetadata, moduleContext);
148-
for (int i = 0; i < marshallers.Length; i++)
149-
{
150-
if (marshallers[i].IsMarshallingRequired())
151-
return true;
152-
}
153-
154-
return false;
155-
}
15627
}
15728
}

‎src/coreclr/tools/aot/ILCompiler.TypeSystem.Tests/ILCompiler.TypeSystem.Tests.csproj‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,12 @@
5858
<Compile Include="../../Common/TypeSystem/IL/ILReader.cs" />
5959
<Compile Include="../../Common/TypeSystem/Interop/IL/MarshalUtils.cs" Link="TypeSystem/Interop/IL/MarshalUtils.cs" />
6060
<Compile Include="../../Common/TypeSystem/Interop/IL/MarshalHelpers.cs" Link="TypeSystem/Interop/IL/MarshalHelpers.cs" />
61+
<Compile Include="../../Common/TypeSystem/Interop/IL/Marshaller.cs" Link="TypeSystem/Interop/IL/Marshaller.cs" />
62+
<Compile Include="../ILCompiler.ReadyToRun/Interop/IL/Marshaller.ReadyToRun.cs" Link="TypeSystem/Interop/IL/Marshaller.ReadyToRun.cs" />
6163
<Compile Include="../../Common/TypeSystem/Interop/IL/MarshallerKind.cs" Link="TypeSystem/Interop/IL/MarshallerKind.cs" />
6264
<Compile Include="../../Common/TypeSystem/Interop/InteropTypes.cs" Link="TypeSystem/Interop/InteropTypes.cs" />
63-
<Compile Include="../../Common/TypeSystem/IL/HelperExtensions.cs" Link="TypeSystem/IL/HelperExtensions" />
65+
<Compile Include="../../Common/TypeSystem/IL/Stubs/PInvokeILCodeStreams.cs" Link="TypeSystem/IL/Stubs/PInvokeILCodeStreams.cs" />
66+
<Compile Include="../../Common/TypeSystem/IL/HelperExtensions.cs" Link="TypeSystem/IL/HelperExtensions.cs" />
6467
<Compile Include="../../Common/Compiler/VectorFieldLayoutAlgorithm.cs" Link="Compiler/VectorFieldLayoutAlgorithm.cs" />
6568
<Compile Include="../../Common/Compiler/Int128FieldLayoutAlgorithm.cs" Link="Compiler/Int128FieldLayoutAlgorithm.cs" />
6669
<Compile Include="ArchitectureSpecificFieldLayoutTests.cs" />

‎src/tests/Interop/DisabledRuntimeMarshalling/AutoLayout.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
namespace DisabledRuntimeMarshalling;
1111

1212
[ActiveIssue("https://github.com/dotnet/runtime/issues/91388", typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.PlatformDoesNotSupportNativeTestAssets))]
13-
[ActiveIssue("https://github.com/dotnet/runtime/issues/81676", typeof(Utilities), nameof(Utilities.IsNativeAot))]
1413
[ActiveIssue("https://github.com/dotnet/runtime/issues/64127", TestRuntimes.Mono)]
1514
public unsafe class PInvokes_AutoLayout
1615
{

‎src/tests/Interop/DisabledRuntimeMarshalling/DisabledRuntimeMarshalling_Disabled_NativeAssemblyEnabled.csproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
<RequiresProcessIsolation>true</RequiresProcessIsolation>
44
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
55
<MonoAotIncompatible>true</MonoAotIncompatible>
6-
<!-- https://github.com/dotnet/runtime/issues/81676 -->
7-
<NativeAotIncompatible>true</NativeAotIncompatible>
86
</PropertyGroup>
97
<ItemGroup>
108
<Compile Include="PInvokeAssemblyMarshallingEnabled/*.cs" />

‎src/tests/Interop/DisabledRuntimeMarshalling/FunctionPointers.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ namespace DisabledRuntimeMarshalling;
1111

1212

1313
[ActiveIssue("https://github.com/dotnet/runtime/issues/91388", typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.PlatformDoesNotSupportNativeTestAssets))]
14-
[ActiveIssue("https://github.com/dotnet/runtime/issues/81676", typeof(Utilities), nameof(Utilities.IsNativeAot))]
1514
[ActiveIssue("https://github.com/dotnet/runtime/issues/64127", TestRuntimes.Mono)]
1615
public unsafe class FunctionPointers
1716
{

‎src/tests/Interop/DisabledRuntimeMarshalling/PInvokeAssemblyMarshallingDisabled/Delegates.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
namespace DisabledRuntimeMarshalling.PInvokeAssemblyMarshallingDisabled;
1111

1212
[ActiveIssue("https://github.com/dotnet/runtime/issues/91388", typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.PlatformDoesNotSupportNativeTestAssets))]
13-
[ActiveIssue("https://github.com/dotnet/runtime/issues/81676", typeof(Utilities), nameof(Utilities.IsNativeAot))]
1413
[ActiveIssue("https://github.com/dotnet/runtime/issues/64127", TestRuntimes.Mono)]
1514
public unsafe class DelegatesFromExternalAssembly
1615
{

‎src/tests/Interop/DisabledRuntimeMarshalling/PInvokeAssemblyMarshallingDisabled/Generics.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace DisabledRuntimeMarshalling;
1313

1414
[ActiveIssue("https://github.com/dotnet/runtime/issues/91388", typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.PlatformDoesNotSupportNativeTestAssets))]
15-
[ActiveIssue("https://github.com/dotnet/runtime/issues/81676", typeof(Utilities), nameof(Utilities.IsNativeAot))]
1615
[ActiveIssue("https://github.com/dotnet/runtime/issues/64127", TestRuntimes.Mono)]
1716
public unsafe class Generics
1817
{

0 commit comments

Comments
 (0)