Skip to content

Fix R2R GC ref map mismatch for unboxing stubs #129829

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

Open
jtschuster wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −2
Open

Fix R2R GC ref map mismatch for unboxing stubs #129829

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions .../aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/MethodFixupSignature.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,12 @@ public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
ObjectDataSignatureBuilder dataBuilder = new ObjectDataSignatureBuilder(factory, relocsOnly);
dataBuilder.AddSymbol(this);

// Optimize some of the fixups into a more compact form
// Optimize some of the fixups into a more compact form.
// The compact token forms cannot carry signature flags, so instantiating and unboxing
// stubs must use the full method signature.
ReadyToRunFixupKind fixupKind = _fixupKind;
bool optimized = false;
if (_method.Method.IsPrimaryMethodDesc() && !IsInstantiatingStub
if (_method.Method.IsPrimaryMethodDesc() && !IsInstantiatingStub && !_method.Unboxing
&& _method.ConstrainedType == null && fixupKind == ReadyToRunFixupKind.MethodEntry)
{
if (!_method.Method.HasInstantiation && !_method.Method.OwningType.HasInstantiation && !_method.Method.OwningType.IsArray)
Expand Down
Loading