Skip to content

Fix missing case for function pointer signatures in Crossgen2 #73341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trylek merged 2 commits into from
Aug 4, 2022
Merged

Fix missing case for function pointer signatures in Crossgen2 #73341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebfc562
Fix missing case for function pointer signatures in Crossgen2
trylek Aug 3, 2022
9a4cc48
Address JanK's PR feedback
trylek Aug 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions ...ools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/SignatureBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,10 @@ public void EmitTypeSignature(TypeDesc typeDesc, SignatureContext context)
EmitPointerTypeSignature((PointerType)typeDesc, context);
return;

case TypeFlags.FunctionPointer:
EmitFunctionPointerTypeSignature((FunctionPointerType)typeDesc, context);
return;

case TypeFlags.ByRef:
EmitByRefTypeSignature((ByRefType)typeDesc, context);
break;
Expand Down Expand Up @@ -366,6 +370,22 @@ private void EmitPointerTypeSignature(PointerType type, SignatureContext context
EmitTypeSignature(type.ParameterType, context);
}

private void EmitFunctionPointerTypeSignature(FunctionPointerType type, SignatureContext context)
{
SignatureCallingConvention callingConvention = (SignatureCallingConvention)(type.Signature.Flags & MethodSignatureFlags.UnmanagedCallingConventionMask);
SignatureAttributes callingConventionAttributes = ((type.Signature.Flags & MethodSignatureFlags.Static) != 0 ? SignatureAttributes.None : SignatureAttributes.Instance);

Comment thread
jkotas marked this conversation as resolved.
EmitElementType(CorElementType.ELEMENT_TYPE_FNPTR);
EmitUInt((uint)((byte)callingConvention | (byte)callingConventionAttributes));
EmitUInt((uint)type.Signature.Length);

EmitTypeSignature(type.Signature.ReturnType, context);
for (int argIndex = 0; argIndex < type.Signature.Length; argIndex++)
{
EmitTypeSignature(type.Signature[argIndex], context);
}
}

private void EmitByRefTypeSignature(ByRefType type, SignatureContext context)
{
EmitElementType(CorElementType.ELEMENT_TYPE_BYREF);
Expand Down
3 changes: 0 additions & 3 deletions src/tests/issues.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -925,9 +925,6 @@
<ExcludeList Include="$(XunitTestBinBase)/JIT/HardwareIntrinsics/Arm/AdvSimd.Arm64/AdvSimd.Arm64_Part2_r/*">
<Issue>https://github.com/dotnet/runtime/issues/63856</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/opt/ValueNumbering/TypeTestFolding/*">
<Issue>https://github.com/dotnet/runtime/issues/72822</Issue>
</ExcludeList>
</ItemGroup>

<!-- NativeAOT specific -->
Expand Down