Skip to content

Require matching WASM function types when folding method bodies #135949

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
MichalStrehovsky merged 3 commits into from
Oct 19, 2026
Merged

Require matching WASM function types when folding method bodies #135949

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e76ec5
Require matching WASM function types when folding method bodies
MichalStrehovsky Oct 16, 2026
ba6b8ea
Merge branch 'main' into nativeaot-wasm-method-folding
MichalStrehovsky Oct 19, 2026
d096062
Feedback
MichalStrehovsky Oct 19, 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
9 changes: 9 additions & 0 deletions src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/MethodBodyDeduplicator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using ILCompiler.DependencyAnalysis;

using Internal.IL.Stubs;
using Internal.JitInterface;
using Internal.TypeSystem;

namespace ILCompiler
Expand Down Expand Up @@ -77,6 +78,9 @@ public MethodInternKey(IMethodBodyNode node, NodeFactory factory, Dictionary<ISy
var hashCode = default(HashCode);
hashCode.AddBytes(data.Data);

if (factory.Target.IsWasm)
hashCode.Add(WasmLowering.GetSignature(node.Method).FuncType);

// Hash relocations consistently with MethodInternComparer.AreSame so that bodies that only differ
// in their relocation targets (e.g. instantiations over different struct state machines)
// don't all end up in the same bucket.
Expand Down Expand Up @@ -183,6 +187,11 @@ public bool Equals(MethodInternKey a, MethodInternKey b)
&& a.Method.Method.GetTypicalMethodDefinition() != b.Method.Method.GetTypicalMethodDefinition())
return false;

// Identical WASM bodies can still have different types when some parameters are unused.
if (_factory.Target.IsWasm
&& !WasmLowering.GetSignature(a.Method.Method).FuncType.Equals(WasmLowering.GetSignature(b.Method.Method).FuncType))
Comment thread
MichalStrehovsky marked this conversation as resolved.
Resolved
return false;

ObjectNode.ObjectData o1data = ((ObjectNode)a.Method).GetData(_factory, relocsOnly: false);
ObjectNode.ObjectData o2data = ((ObjectNode)b.Method).GetData(_factory, relocsOnly: false);

Expand Down
Loading