Skip to content

Fix CAS errors related to moving of LinkerOptions amongst other things from MCAssember to MachObjectWriter #9062

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

Merged

Conversation

rastogishubham
Copy link

This patch fixes any MCCAS errors we have from the work that Fangrui has done upstream to move major components from MCAssembler to MachObjectWriter

rdar://133264719 (🌲6.0+1 CAS failures on rebranch)

Because of eb22392, the LinkerOptions have been moved from
MCAssembler to MachObjectWriter, but MachOCASWriter doesn't have access
to those linker options, this patch fixes the bug by moving the
LinkerOptions to MCObjectWriter instead.
@rastogishubham
Copy link
Author

@swift-ci please test

Copy link

@cachemeifyoucan cachemeifyoucan left a comment

Choose a reason for hiding this comment

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

LGTM after addressing one last comment.

@rastogishubham
Copy link
Author

@swift-ci please test

@rastogishubham rastogishubham merged commit 8001d51 into swiftlang:stable/20240723 Aug 8, 2024
0 of 3 checks passed
@rastogishubham rastogishubham deleted the FixCASErrStable branch August 8, 2024 17:01
@bnbarham
Copy link

bnbarham commented Aug 14, 2024

@rastogishubham looks like this breaks the Windows build. Would you mind looking into that? (eg. https://ci-external.swift.org/job/swift-rebranch-windows-toolchain-arm64, though looks like it is currently failing for different reasons)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants