Skip to content
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.

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

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

Merged
merged 1 commit into from
Jan 24, 2025

Conversation

tomeksowi
Copy link
Contributor

Caused a crash on RISC-V during R2RDump --in System.Private.CoreLib.dll --disasm --gc

Part of #84834, cc @dotnet/samsung @VSadov

@dotnet-issue-labeler dotnet-issue-labeler bot added the area-R2RDump-coreclr Ready-to-run image dump tool label Jan 24, 2025
@dotnet-policy-service dotnet-policy-service bot added the community-contribution Indicates that the PR has been added by a community member label Jan 24, 2025
@tomeksowi tomeksowi changed the title Fix reversed code offsets in GcInfo interruptible ranges decoder R2RDump: Fix reversed code offsets in GcInfo interruptible ranges decoder Jan 24, 2025
@@ -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.

Copy link
Member

@VSadov VSadov left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks!!

@VSadov
Copy link
Member

VSadov commented Jan 24, 2025

/azp run runtime-nativeaot-outerloop

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@jkotas jkotas merged commit 6c73c19 into dotnet:main Jan 24, 2025
107 of 113 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-R2RDump-coreclr Ready-to-run image dump tool community-contribution Indicates that the PR has been added by a community member
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants