Skip to content

Add arm64 -> arm64e fallback to module loading #39083

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 2 commits into from
Sep 10, 2021

Conversation

beccadax
Copy link
Contributor

If we are building for ARM64 but we try to import a module with only an ARM64e interface, fall back to importing said interface.

This is the reverse of a similar fallback briefly introduced last year, but removed in #31196.

rdar://82362695

DummyFramework.framework has two different properties to support two different kinds of test cases: to support ModuleInterface/build-alternative-interface-framework.swift, its macOS interfaces are broken, but to support ModuleInterface/arm64e-fallback.swift, it supports only arm64, not arm64e, on iOS. The arm64e test's behavior is about to change, which will complicate all of this. As a preliminary step, make the two tests use two different frameworks so they aren't so intertwined.

This temporarily keeps the arm64e test using the name "DummyFramework", but that will change.
@beccadax
Copy link
Contributor Author

@swift-ci please test

@beccadax
Copy link
Contributor Author

@nkcsgexi I'm hoping you can confirm that my changes to ModuleInterface/build-alternative-interface-framework.swift are correct.

@varungandhi-apple I'm hoping you can confirm that we're testing what we want to test with regards to arm64e.

@Bo98 Bo98 mentioned this pull request Aug 31, 2021
5 tasks
If we are building for ARM64 but we try to import a module with only an ARM64e interface, fall back to importing said interface.

This is the reverse of a similar fallback briefly introduced last year, but removed in swiftlang#31196.
Copy link
Contributor

@varungandhi-apple varungandhi-apple left a comment

Choose a reason for hiding this comment

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

The testing bit LGTM. 👍🏼

@beccadax
Copy link
Contributor Author

beccadax commented Sep 8, 2021

@swift-ci smoke test

@beccadax beccadax merged commit e13fafc into swiftlang:main Sep 10, 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.

3 participants