Skip to content

Commit effa643

Browse files
[ModuleInterface] Remove fallback behavior for arm64e -> arm64.
Addresses rdar://problem/61407215.
1 parent 1de2aea commit effa643

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

lib/Serialization/SerializedModuleLoader.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,10 @@ void forEachTargetModuleBasename(const ASTContext &Ctx,
4949
// names checked in "#if arch(...)". Fall back to that name in the one case
5050
// where it's different from what Swift 4.2 supported:
5151
// - 32-bit ARM platforms (formerly "arm")
52-
// - arm64e (formerly shared with "arm64")
5352
// We should be able to drop this once there's an Xcode that supports the
5453
// new names.
55-
if (Ctx.LangOpts.Target.getArch() == llvm::Triple::ArchType::arm)
54+
if (Ctx.LangOpts.Target.getArch() == llvm::Triple::ArchType::arm) {
5655
body("arm");
57-
else if (Ctx.LangOpts.Target.getSubArch() ==
58-
llvm::Triple::SubArchType::AArch64SubArch_E) {
59-
body("arm64");
6056
}
6157
}
6258

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
// RUN: %target-typecheck-verify-swift %s -target arm64e-apple-ios13.0 -F %S/Inputs
1+
// RUN: not %target-typecheck-verify-swift -target arm64e-apple-ios13.0 -F %S/Inputs 2>&1 | %FileCheck %s
22

33
// REQUIRES: OS=ios
44

55
import DummyFramework
6+
// CHECK: no such module 'DummyFramework'

0 commit comments

Comments
 (0)