Fix MachO adrp/add and branch relocations with embedded addend #124083

jakobbotsch · 2026-02-06T12:31:49Z

These cannot have any addend embedded in the instruction and must instead be handled via a additional reloc entry. The object writer already knows how to create these reloc entries, but it was leaving the embedded addend in the instruction in some cases.

Fix #124015

These cannot have any addend embedded in the instruction and must instead be handled via a additional reloc entry. The object writer already knows how to create these reloc entries, but it was leaving the embedded addend in the intstruction in some cases.

jakobbotsch · 2026-02-06T12:34:39Z

/azp run runtime-nativeaot-outerloop

azure-pipelines · 2026-02-06T12:34:58Z

Azure Pipelines successfully started running 1 pipeline(s).

dotnet-policy-service · 2026-02-06T12:36:07Z

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 fixes a bug in the MachO object writer where ARM64 relocations (ADRP/ADD and BRANCH26) were incorrectly leaving embedded addends in the instruction encoding. According to the MachO format specification for ARM64, these relocation types cannot have addends embedded in the instruction - instead, addends must be communicated through separate ARM64_RELOC_ADDEND relocation entries.

Changes:

Added IMAGE_REL_BASED_ARM64_BRANCH26 to the case statement handling ARM64 relocations that require addend extraction and clearing
Ensured that any existing addend value embedded in the BRANCH26 instruction is read out, accumulated into the addend variable, and then the instruction is cleared to zero

jkotas · 2026-02-06T12:43:32Z

Can we re-enable the test disabled against the fixed issue?

runtime/src/libraries/System.Diagnostics.StackTrace/tests/StackTraceTests.cs

Line 630 in 506b9a1

    
           [ActiveIssue("https://github.com/dotnet/runtime/issues/124015", typeof(PlatformDetection), nameof(PlatformDetection.IsArm64Process))]

jakobbotsch · 2026-02-06T12:47:13Z

Can we re-enable the test disabled against the fixed issue?

runtime/src/libraries/System.Diagnostics.StackTrace/tests/StackTraceTests.cs

Line 630 in 506b9a1

[ActiveIssue("https://github.com/dotnet/runtime/issues/124015", typeof(PlatformDetection), nameof(PlatformDetection.IsArm64Process))]

Thanks, reenabled that.

jakobbotsch · 2026-02-06T12:47:17Z

/azp run runtime-nativeaot-outerloop

azure-pipelines · 2026-02-06T12:47:27Z

Azure Pipelines successfully started running 1 pipeline(s).

Copilot

Pull request overview

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

src/coreclr/tools/Common/Compiler/ObjectWriter/MachObjectWriter.cs

jakobbotsch · 2026-02-06T13:19:49Z

The LLVM code at https://github.com/llvm/llvm-project/blob/3a084241248efd7d5259183cffae1d5b7057a54c/llvm/lib/Target/AArch64/MCTargetDesc/AArch64MachObjectWriter.cpp#L355-L382 does it for Branch26 as well, but in my tests the embedded addends for those appear to be fine, so I have left that out.

Edit: The documentation is quite clear to use ARM64_RELOC_ADDEND though, so I reapplied this.

Copilot

Pull request overview

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

This reverts commit 8461bc8.

jakobbotsch · 2026-02-06T13:42:57Z

/azp run runtime-nativeaot-outerloop

azure-pipelines · 2026-02-06T13:43:07Z

Azure Pipelines successfully started running 1 pipeline(s).

jakobbotsch · 2026-02-09T10:57:15Z

The runtime-nativeaot-outerloop osx-arm64 failure looks related, but I cannot reproduce it locally after running in a loop for a while.

jakobbotsch · 2026-02-09T10:57:20Z

/azp run runtime-nativeaot-outerloop

azure-pipelines · 2026-02-09T10:57:27Z

Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command.

jakobbotsch · 2026-02-09T10:58:34Z

/azp run runtime-nativeaot-outerloop

azure-pipelines · 2026-02-09T10:58:52Z

Azure Pipelines successfully started running 1 pipeline(s).

Copilot

Pull request overview

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

## Description This PR fixes several failures encountered in extra-platforms pipeline: - Updates `ZipMergedPayloadDirectory` target to use `PreparePayloadDirectories` instead of `PrepareMergedTestPayloadDirectories`, which was inlined in #123110. This should fix Apple mobile runtime tests - Includes StandaloneTestRunner markers used for Native AOT mobile tests - Excludes test markers for shared libraries on Android - Disables unreliable socket tests on Apple mobile Native AOT builds will be fixed in #124083 --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

jakobbotsch · 2026-02-09T13:33:09Z

/azp run runtime-nativeaot-outerloop

azure-pipelines · 2026-02-09T13:33:29Z

Azure Pipelines successfully started running 1 pipeline(s).

MichalStrehovsky

Thank you!

jakobbotsch · 2026-02-10T12:13:58Z

/ba-g Timeout and unmatched dotnet/dnceng#6457

jakobbotsch · 2026-02-10T22:20:15Z

/ba-g Timeout and unmatched dotnet/dnceng#6457

Copilot AI review requested due to automatic review settings February 6, 2026 12:31

github-actions bot added the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label Feb 6, 2026

dotnet-policy-service bot assigned jakobbotsch Feb 6, 2026

Copilot started reviewing on behalf of jakobbotsch February 6, 2026 12:32 View session

jakobbotsch requested a review from filipnavara February 6, 2026 12:33

jakobbotsch changed the title ~~Fix MachO relocations adrp/add and branch relocations~~ Fix MachO adrp/add and branch relocations Feb 6, 2026

jakobbotsch changed the title ~~Fix MachO adrp/add and branch relocations~~ Fix MachO adrp/add and branch relocations with embedded addend Feb 6, 2026

jakobbotsch added area-NativeAOT-coreclr and removed needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners labels Feb 6, 2026

filipnavara approved these changes Feb 6, 2026

View reviewed changes

Copilot AI reviewed Feb 6, 2026

View reviewed changes

jakobbotsch added 2 commits February 6, 2026 13:45

Reenable test

8982c9e

Merge branch 'main' of github.com:dotnet/runtime into fix-124015

5640f3c

Copilot AI review requested due to automatic review settings February 6, 2026 12:46

Copilot started reviewing on behalf of jakobbotsch February 6, 2026 12:46 View session

Copilot AI reviewed Feb 6, 2026

View reviewed changes

src/coreclr/tools/Common/Compiler/ObjectWriter/MachObjectWriter.cs Show resolved Hide resolved

jakobbotsch added 2 commits February 6, 2026 14:05

Handle addend for ARM64_RELOC_BRANCH26 too

f32f2a0

Revert Branch26 handling

8461bc8

Copilot AI review requested due to automatic review settings February 6, 2026 13:18

Copilot started reviewing on behalf of jakobbotsch February 6, 2026 13:19 View session

Copilot AI reviewed Feb 6, 2026

View reviewed changes

Revert "Revert Branch26 handling"

d2a6ef9

This reverts commit 8461bc8.

MichalStrehovsky mentioned this pull request Feb 9, 2026

Fix mobile build and test failures in extra-platforms pipeline #124000

Merged

Merge branch 'main' of github.com:dotnet/runtime into fix-124015

91a5dd6

Copilot AI review requested due to automatic review settings February 9, 2026 10:58

Copilot started reviewing on behalf of jakobbotsch February 9, 2026 10:59 View session

Copilot AI reviewed Feb 9, 2026

View reviewed changes

MichalStrehovsky approved these changes Feb 10, 2026

View reviewed changes

jakobbotsch marked this pull request as ready for review February 10, 2026 09:30

jakobbotsch mentioned this pull request Feb 10, 2026

Some Helix workitems fail with "ModuleNotFoundError: No module named 'pkg_resources'" dotnet/dnceng#6457

Closed

3 tasks

This was referenced Feb 10, 2026

[android] Android.Device_Emulator.JIT.Test failing on emulators with CoreCLR #112633

Open

[Android][CoreCLR] System.Security.Cryptography.Tests killed by lowmemorykiller #118603

Open

jakobbotsch merged commit c4a5583 into dotnet:main Feb 10, 2026
154 of 164 checks passed

jakobbotsch deleted the fix-124015 branch February 10, 2026 22:20

dotnet-maestro bot mentioned this pull request Feb 11, 2026

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

Merged

Fix MachO adrp/add and branch relocations with embedded addend #124083

Fix MachO adrp/add and branch relocations with embedded addend #124083

Uh oh!

Conversation

jakobbotsch commented Feb 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jakobbotsch commented Feb 6, 2026

Uh oh!

azure-pipelines bot commented Feb 6, 2026

Uh oh!

dotnet-policy-service bot commented Feb 6, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

jkotas commented Feb 6, 2026

Uh oh!

jakobbotsch commented Feb 6, 2026

Uh oh!

jakobbotsch commented Feb 6, 2026

Uh oh!

azure-pipelines bot commented Feb 6, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

jakobbotsch commented Feb 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

jakobbotsch commented Feb 6, 2026

Uh oh!

azure-pipelines bot commented Feb 6, 2026

Uh oh!

jakobbotsch commented Feb 9, 2026

Uh oh!

jakobbotsch commented Feb 9, 2026

Uh oh!

azure-pipelines bot commented Feb 9, 2026

Uh oh!

jakobbotsch commented Feb 9, 2026

Uh oh!

azure-pipelines bot commented Feb 9, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

jakobbotsch commented Feb 9, 2026

Uh oh!

azure-pipelines bot commented Feb 9, 2026

Uh oh!

MichalStrehovsky left a comment

Choose a reason for hiding this comment

Uh oh!

jakobbotsch commented Feb 10, 2026

Uh oh!

jakobbotsch commented Feb 10, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

jakobbotsch commented Feb 6, 2026 •

edited

Loading

jakobbotsch commented Feb 6, 2026 •

edited

Loading