Skip to content

ModuleInterface: sanitize arch when interface file name and encoded flags disagree #37961

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
merged 1 commit into from
Jun 21, 2021

Conversation

nkcsgexi
Copy link
Contributor

It's a known issue that we are using arm64e interfaces contents for the arm64 target,
meaning the encoded module flags are specifying -target arm64e-x-x instead of
-target arm64-x-x. Fortunately, we can tell the target arch from the interface file
name, so we could sanitize the target to use by inferring arch from the file name.

@nkcsgexi nkcsgexi changed the title ModuleInterface: sanitize arch when interface file name and encoded flags disagree [WIP] ModuleInterface: sanitize arch when interface file name and encoded flags disagree Jun 17, 2021
@nkcsgexi nkcsgexi requested a review from edymtt June 17, 2021 03:05
@nkcsgexi
Copy link
Contributor Author

@swift-ci please test

@nkcsgexi nkcsgexi force-pushed the sanitize-when-disagree branch from 797bf9e to 98f7446 Compare June 17, 2021 03:07
@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 797bf9ee82841a7edf240fe43f0a7f1712b7568f

…lags disagree

It's a known issue that we are using arm64e interfaces contents for the arm64 target,
meaning the encoded module flags are specifying -target arm64e-x-x instead of
-target arm64-x-x. Fortunately, we can tell the target arch from the interface file
name, so we could sanitize the target to use by inferring arch from the file name.
@nkcsgexi nkcsgexi force-pushed the sanitize-when-disagree branch from 98f7446 to 49c64cf Compare June 17, 2021 05:21
@nkcsgexi
Copy link
Contributor Author

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 49c64cf

@nkcsgexi
Copy link
Contributor Author

@swift-ci Please smoke test OS X platform

@shahmishal
Copy link
Member

@swift-ci test new Xcode

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 49c64cf

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 49c64cf

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 49c64cf

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 49c64cf

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 49c64cf

@edymtt
Copy link
Contributor

edymtt commented Jun 17, 2021

Approved based on the fact that this work for me on my local machine when building with Xcode 13.0 beta 1 -- cannot vouch for any other aspect of this PR

@DougGregor
Copy link
Member

@swift-ci please smoke test macOS

@nkcsgexi
Copy link
Contributor Author

@shahmishal Please notice the macOS tests failed for mysterious reasons.

@nkcsgexi nkcsgexi changed the title [WIP] ModuleInterface: sanitize arch when interface file name and encoded flags disagree ModuleInterface: sanitize arch when interface file name and encoded flags disagree Jun 17, 2021
@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 49c64cf

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 49c64cf

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 49c64cf

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 49c64cf

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 49c64cf

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 49c64cf

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 49c64cf

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 49c64cf

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 49c64cf

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 49c64cf

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 49c64cf

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 49c64cf

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 49c64cf

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 49c64cf

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 49c64cf

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 49c64cf

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 49c64cf

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 49c64cf

@DougGregor DougGregor merged commit c6039af into swiftlang:main Jun 21, 2021
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.

5 participants