Skip to content

Remove fallback for arm64e -> arm64. #31196

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

varungandhi-apple
Copy link
Contributor

Fixes rdar://problem/61407215

@varungandhi-apple
Copy link
Contributor Author

@swift-ci please smoke test

Copy link
Contributor

@beccadax beccadax left a comment

Choose a reason for hiding this comment

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

Might not actually need any changes—take a look.

@varungandhi-apple
Copy link
Contributor Author

varungandhi-apple commented Apr 22, 2020

Might not actually need any changes

I don't get it. This branch shouldn't be present, should it?

  else if (Ctx.LangOpts.Target.getSubArch() ==
            llvm::Triple::SubArchType::AArch64SubArch_E) {
     body("arm64");

I've removed it in the middle commit.

@varungandhi-apple varungandhi-apple force-pushed the vg-remove-arm64e-fallback branch from b78f5d0 to 94eed0e Compare April 22, 2020 18:10
@varungandhi-apple
Copy link
Contributor Author

@swift-ci please smoke test

@varungandhi-apple varungandhi-apple force-pushed the vg-remove-arm64e-fallback branch from 94eed0e to 9f3ba78 Compare April 23, 2020 06:41
…g arch.

Before this change, we would emit the warning only for swiftmodules; however,
it may be the case that only a swiftinterface (of a different arch) is present
but no swiftmodule is present.

Fixes rdar://problem/50905075.
@varungandhi-apple varungandhi-apple force-pushed the vg-remove-arm64e-fallback branch from 9f3ba78 to 412ee0a Compare April 23, 2020 07:28
@varungandhi-apple
Copy link
Contributor Author

@swift-ci please smoke test

@varungandhi-apple varungandhi-apple merged commit 9c1615c into swiftlang:master Apr 23, 2020
beccadax added a commit to beccadax/swift that referenced this pull request Sep 7, 2021
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.
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