Skip to content

R2RDump: Fix reversed code offsets in GcInfo interruptible ranges decoder #111792

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
merged 1 commit into from
Jan 24, 2025
Merged

R2RDump: Fix reversed code offsets in GcInfo interruptible ranges decoder #111792

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/Amd64/GcInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,8 +381,8 @@ private List<InterruptibleRange> EnumerateInterruptibleRanges(byte[] image, int
uint normRangeStartOffset = normLastinterruptibleRangeStopOffset + normStartDelta;
uint normRangeStopOffset = normRangeStartOffset + normStopDelta;

uint rangeStartOffset = _gcInfoTypes.DenormalizeCodeOffset(normRangeStopOffset);
uint rangeStopOffset = _gcInfoTypes.DenormalizeCodeOffset(normRangeStartOffset);
uint rangeStartOffset = _gcInfoTypes.DenormalizeCodeOffset(normRangeStartOffset);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like it was swapped in #110845. Possibly a copy/paste error.

uint rangeStopOffset = _gcInfoTypes.DenormalizeCodeOffset(normRangeStopOffset);
ranges.Add(new InterruptibleRange(i, rangeStartOffset, rangeStopOffset));

normLastinterruptibleRangeStopOffset = normRangeStopOffset;
Expand Down
2 changes: 2 additions & 0 deletions src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/Amd64/GcTransition.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Reflection.PortableExecutable;
using System.Text;

Expand All @@ -16,6 +17,7 @@ public struct InterruptibleRange
public InterruptibleRange(uint index, uint start, uint stop)
{
Index = index;
Debug.Assert(start <= stop);
StartOffset = start;
StopOffset = stop;
}
Expand Down
Loading