[NativeAOT] fix NAOT mappings (follow-up to https://github.com/dotnet/runtime/pull/123333) by rcj1 · Pull Request #123831 · dotnet/runtime

rcj1 · 2026-01-31T02:26:42Z

Testing on #122722 revealed some issues with #123333 so I am fixing these here.

After #123333 there remain two error cases:

Our IL offset is greater than the previously found offset, but lower than the max found offset. In this case, we would like to advance the line number in accordance with the new IL offset, which was omitted after [NativeAOT] Source to native mapping fix for out-of-order code #123333.
Our IL offset is greater than the highest IL offset for which there exists a sequence point. In this case, we want to ensure we can create a native <-> line mapping - [NativeAOT] Source to native mapping fix for out-of-order code #123333 had left these IL offsets with a Document of null, meaning no mappings were possible.
This fixes both of these issues.

Before:

After:

foo.txt
foo2.txt
New Compressed (zipped) Folder.zip

dotnet-policy-service · 2026-01-31T02:27:36Z

Tagging subscribers to this area: @agocke, @dotnet/ilc-contrib
See info in area-owners.md if you want to be subscribed.

Copilot

Pull request overview

This PR refines NativeAOT’s IL-to-native sequence point mapping to close gaps found after #123333, ensuring more accurate source line attribution in stack traces, especially for runtime-async scenarios described in #122722.

Changes:

Extend propagation of the last known document/line info across the entire temporary sequencePoints buffer so IL offsets beyond the last explicit sequence point still get a valid document/line mapping.
Replace the per-iteration previousIlOffset tracking with a maxIlOffset tracker and adjust the emission condition so sequence points are produced both when backed by PDB info and whenever the IL offset falls within or below the maximum IL offset seen so far, fixing cases where IL offsets re-enter earlier ranges.

jkotas

LGTM!

@MichalStrehovsky Could you please take a look as well?

Co-authored-by: Michal Strehovský <MichalStrehovsky@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.

…lysis/MethodCodeNode.cs Co-authored-by: Michal Strehovský <MichalStrehovsky@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.

rcj1 · 2026-02-03T03:47:51Z

Hm, I have requested the pipeline be rerun but it is still “neutral” on many runs.

jkotas · 2026-02-03T04:37:01Z

/azp run runtime-nativeaot-outerloop

azure-pipelines · 2026-02-03T04:37:12Z

Azure Pipelines successfully started running 1 pipeline(s).

jkotas · 2026-02-03T04:38:16Z

I have requested the pipeline be rerun but it is still “neutral” on many runs.

There was an infra outage earlier today, the system may be still recovering from it.

rcj1 · 2026-02-03T15:10:49Z

/ba-g timeouts

…3831) Testing on dotnet#122722 revealed some issues with dotnet#123333 so I am fixing these here. After dotnet#123333 there remain two error cases: 1. Our IL offset is greater than the previously found offset, but lower than the max found offset. In this case, we would like to advance the line number in accordance with the new IL offset, which was omitted after dotnet#123333. 2. Our IL offset is greater than the highest IL offset for which there exists a sequence point. In this case, we want to ensure we can create a native <-> line mapping - dotnet#123333 had left these IL offsets with a Document of null, meaning no mappings were possible. This fixes both of these issues. Before: <img width="1298" height="268" alt="Screenshot 2026-01-30 192451" src="https://github.com/user-attachments/assets/ab46947f-ea52-4530-949b-3e36bf3b3df6" /> <img width="1312" height="359" alt="Screenshot 2026-01-30 192408" src="https://github.com/user-attachments/assets/b08a8f45-0af2-484a-8392-8d12c3694361" /> After: <img width="1020" height="311" alt="Screenshot 2026-01-30 190332" src="https://github.com/user-attachments/assets/ac8bca54-6466-4436-9fac-1f6f685e7bd0" /> <img width="1030" height="400" alt="Screenshot 2026-01-30 190613" src="https://github.com/user-attachments/assets/321c8160-cf06-4f43-8c36-352d2bd6908a" /> [foo.txt](https://github.com/user-attachments/files/24984632/foo.txt) [foo2.txt](https://github.com/user-attachments/files/24984633/foo2.txt) [New Compressed (zipped) Folder.zip](https://github.com/user-attachments/files/24976959/New.Compressed.zipped.Folder.zip) --------- Co-authored-by: Michal Strehovský <MichalStrehovsky@users.noreply.github.com> Co-authored-by: Jan Kotas <jkotas@microsoft.com>

fix mappings

82202e6

rcj1 requested a review from MichalStrehovsky as a code owner January 31, 2026 02:26

Copilot AI review requested due to automatic review settings January 31, 2026 02:26

github-actions Bot added the area-NativeAOT-coreclr label Jan 31, 2026

dotnet-policy-service Bot assigned rcj1 Jan 31, 2026

Copilot started reviewing on behalf of rcj1 January 31, 2026 02:27 View session

rcj1 requested a review from jkotas January 31, 2026 02:27

Copilot AI reviewed Jan 31, 2026

View reviewed changes

This was referenced Jan 31, 2026

iOS.Device test WorkItemExecutions #122874

Closed

XHarness package install failure on iOS due to devicectl NSPOSIXErrorDomain error 49 #123796

Open

jkotas reviewed Feb 2, 2026

View reviewed changes

Comment thread src/coreclr/tools/aot/ILCompiler.RyuJit/Compiler/DependencyAnalysis/MethodCodeNode.cs

jkotas reviewed Feb 2, 2026

View reviewed changes

Comment thread src/coreclr/tools/aot/ILCompiler.RyuJit/Compiler/DependencyAnalysis/MethodCodeNode.cs

jkotas reviewed Feb 2, 2026

View reviewed changes

Comment thread src/coreclr/tools/aot/ILCompiler.RyuJit/Compiler/DependencyAnalysis/MethodCodeNode.cs

jkotas reviewed Feb 2, 2026

View reviewed changes

Comment thread src/coreclr/tools/aot/ILCompiler.RyuJit/Compiler/DependencyAnalysis/MethodCodeNode.cs Outdated

code review

b1cc0fc

jkotas approved these changes Feb 2, 2026

View reviewed changes

MichalStrehovsky approved these changes Feb 2, 2026

View reviewed changes

Comment thread ...reclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/StackTraceLineNumbersNode.cs

Comment thread src/coreclr/tools/aot/ILCompiler.RyuJit/Compiler/DependencyAnalysis/MethodCodeNode.cs Outdated

Apply suggestions from code review

93769cc

Co-authored-by: Michal Strehovský <MichalStrehovsky@users.noreply.github.com>

Copilot AI review requested due to automatic review settings February 2, 2026 21:58

Copilot AI reviewed Feb 2, 2026

View reviewed changes

Comment thread src/coreclr/tools/aot/ILCompiler.RyuJit/Compiler/DependencyAnalysis/MethodCodeNode.cs

Comment thread src/coreclr/tools/aot/ILCompiler.RyuJit/Compiler/DependencyAnalysis/MethodCodeNode.cs

Update src/coreclr/tools/aot/ILCompiler.RyuJit/Compiler/DependencyAna…

0ea5363

…lysis/MethodCodeNode.cs Co-authored-by: Michal Strehovský <MichalStrehovsky@users.noreply.github.com>

Copilot AI review requested due to automatic review settings February 2, 2026 22:26

Copilot AI reviewed Feb 2, 2026

View reviewed changes

Comment thread src/coreclr/tools/aot/ILCompiler.RyuJit/Compiler/DependencyAnalysis/MethodCodeNode.cs

Merge branch 'main' into aot-mapping-fix-2

d107008

build-analysis Bot mentioned this pull request Feb 3, 2026

The Operation will be canceled. The next steps may not contain expected logs. dotnet/dnceng#3008

Open

3 tasks

This was referenced Feb 3, 2026

[android-arm64] The Operation will be canceled. The next steps may not contain expected logs. dotnet/dnceng#6408

Closed

Test failure: GC/API/GC/GetTotalAllocatedBytes/GetTotalAllocatedBytes.cmd #121482

Closed

rcj1 merged commit e646a55 into dotnet:main Feb 3, 2026
118 of 125 checks passed

rcj1 deleted the aot-mapping-fix-2 branch February 3, 2026 15:11

dotnet-maestro Bot mentioned this pull request Feb 5, 2026

[main] Source code updates from dotnet/runtime dotnet/dotnet#4680

Merged

github-actions Bot locked and limited conversation to collaborators Mar 6, 2026

Conversation

rcj1 commented Jan 31, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dotnet-policy-service Bot commented Jan 31, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jkotas left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

rcj1 commented Feb 3, 2026

Uh oh!

jkotas commented Feb 3, 2026

Uh oh!

azure-pipelines Bot commented Feb 3, 2026

Uh oh!

jkotas commented Feb 3, 2026

Uh oh!

rcj1 commented Feb 3, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

rcj1 commented Jan 31, 2026 •

edited

Loading