Skip to content

Crossgen2: pass the hidden type arg for wasm array Address thunks #133624

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
AndyAyersMS merged 2 commits into from
Sep 11, 2026
+3 −14
Merged

Crossgen2: pass the hidden type arg for wasm array Address thunks #133624

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
0fbc284
Crossgen2: pass the hidden type arg for wasm array Address thunks
AndyAyersMS Sep 10, 2026
29f7ce8
Crossgen2: array Address methods have a hidden arg on all targets
AndyAyersMS Sep 10, 2026
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
2 changes: 1 addition & 1 deletion src/coreclr/tools/Common/JitInterface/WasmLowering.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ public static unsafe WasmSignature GetSignature(MethodSignature signature, CORIN
public static LoweringFlags GetLoweringFlags(MethodDesc method)
{
LoweringFlags flags = 0;
if (method.RequiresInstMethodDescArg() || method.RequiresInstMethodTableArg())
if (method.RequiresInstMethodDescArg() || method.RequiresInstMethodTableArg() || method.IsArrayAddressMethod())
{
flags |= LoweringFlags.HasGenericContextArg;
}
Expand Down
9 changes: 1 addition & 8 deletions ...tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/GCRefMapBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,7 @@ internal static (ArgIterator<TypeHandle>, TransitionBlock) BuildArgIterator(Meth
parameterTypes[parameterIndex] = new TypeHandle(signature[parameterIndex]);
}
CallingConventions callingConventions = (hasThis ? CallingConventions.ManagedInstance : CallingConventions.ManagedStatic);
bool hasParamType = methodRequiresInstArg && !isUnboxingStub;

// On X86 the Array address method doesn't use IL stubs, and instead has a custom calling convention
if ((context.Target.Architecture == TargetArchitecture.X86) &&
methodIsArrayAddressMethod)
{
hasParamType = true;
}
bool hasParamType = (methodRequiresInstArg && !isUnboxingStub) || methodIsArrayAddressMethod;

bool hasAsyncContinuation = methodIsAsyncCall;
// We shouldn't be compiling unboxing stubs for async methods yet.
Expand Down
6 changes: 1 addition & 5 deletions src/tests/readytorun/crossgen2/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2272,11 +2272,7 @@ public static int Main()
RunTest("ExplicitlySizedClassTest", ExplicitlySizedClassTest());
RunTest("GenericLdtokenTest", GenericLdtokenTest());
RunTest("ArrayLdtokenTests", ArrayLdtokenTests());
// ActiveIssue https://github.com/dotnet/runtime/issues/133307
if (!PlatformDetection.IsWasm || !PlatformDetection.IsReadyToRunCompiled)
{
RunTest("TestGenericMDArrayBehavior", TestGenericMDArrayBehavior());
}
RunTest("TestGenericMDArrayBehavior", TestGenericMDArrayBehavior());
RunTest("TestWithStructureNonBlittableFieldDueToGenerics", TestWithStructureNonBlittableFieldDueToGenerics());
RunTest("TestSingleElementStructABI", TestSingleElementStructABI());
RunTest("TestEnumLayoutAlignments", TestEnumLayoutAlignments());
Expand Down
Loading