Merge pull request swiftlang#39083 from beccadax/give-me-some-e

Add arm64 -> arm64e fallback to module loading

Author: beccadax

lib/Serialization/SerializedModuleLoader.cpp

@@ -46,8 +46,23 @@ namespace {
 void forEachTargetModuleBasename(const ASTContext &Ctx,
                                  llvm::function_ref<void(StringRef)> body) {
   auto normalizedTarget = getTargetSpecificModuleTriple(Ctx.LangOpts.Target);
+
+  // An arm64 module can import an arm64e module.
+  Optional<llvm::Triple> normalizedAltTarget;
+  if ((normalizedTarget.getArch() == llvm::Triple::ArchType::aarch64) &&
+      (normalizedTarget.getSubArch() !=
+       llvm::Triple::SubArchType::AArch64SubArch_arm64e)) {
+    auto altTarget = normalizedTarget;
+    altTarget.setArchName("arm64e");
+    normalizedAltTarget = getTargetSpecificModuleTriple(altTarget);
+  }
+
   body(normalizedTarget.str());
 
+  if (normalizedAltTarget) {
+    body(normalizedAltTarget->str());
+  }
+
   // We used the un-normalized architecture as a target-specific
   // module name. Fall back to that behavior.
   body(Ctx.LangOpts.Target.getArchName());
@@ -61,6 +76,10 @@ void forEachTargetModuleBasename(const ASTContext &Ctx,
   if (Ctx.LangOpts.Target.getArch() == llvm::Triple::ArchType::arm) {
     body("arm");
   }
+
+  if (normalizedAltTarget) {
+    body(normalizedAltTarget->getArchName());
+  }
 }
 
 enum class SearchPathKind {

test/ModuleInterface/Inputs/DummyFramework.framework/Modules/DummyFramework.swiftmodule/arm64-apple-macos.swiftinterface renamed to test/ModuleInterface/Inputs/BrokenFramework.framework/Modules/BrokenFramework.swiftmodule/arm64-apple-macos.swiftinterface

@@ -0,0 +1,10 @@
+// swift-interface-format-version: 1.0
+// swift-compiler-version: Apple Swift version 5.2
+// swift-module-flags: -target arm64e-apple-ios13.0 -enable-library-evolution -swift-version 5 -module-name PtrAuthFramework
+import Swift
+
+#if _ptrauth(_arm64e)
+public let iOSPtrAuth: Bool = true
+#else
+public let iOSNotPtrAuth: Bool = true
+#endif

test/ModuleInterface/Inputs/DummyFramework.framework/Modules/DummyFramework.swiftmodule/arm64e-apple-macos.swiftinterface renamed to test/ModuleInterface/Inputs/BrokenFramework.framework/Modules/BrokenFramework.swiftmodule/arm64e-apple-macos.swiftinterface

@@ -0,0 +1,10 @@
+// swift-interface-format-version: 1.0
+// swift-compiler-version: Apple Swift version 5.2
+// swift-module-flags: -target arm64e-apple-macos10.13 -enable-library-evolution -swift-version 5 -module-name PtrAuthFramework
+import Swift
+
+#if _ptrauth(_arm64e)
+public let macOSPtrAuth: Bool = true
+#else
+public let macOSNotPtrAuth: Bool = true
+#endif