Merge pull request #37490 from ahoppen/pr-5.4/rdar-78035645

[5.4][Deserialization] Fix error when typealias required by protocol refers to type in @_implementationOnly module

Author: ahoppen

lib/Serialization/Deserialization.cpp

@@ -6197,8 +6197,26 @@ void ModuleFile::finishNormalConformance(NormalProtocolConformance *conformance,
     // FIXME: We don't actually want to allocate an archetype here; we just
     // want to get an access path within the protocol.
     auto first = cast<AssociatedTypeDecl>(getDecl(*rawIDIter++));
-    auto second = getType(*rawIDIter++);
-    auto third = cast_or_null<TypeDecl>(getDecl(*rawIDIter++));
+    auto secondOrError = getTypeChecked(*rawIDIter++);
+    Type second;
+    if (secondOrError) {
+      second = *secondOrError;
+    } else if (getContext().LangOpts.EnableDeserializationRecovery) {
+      second = ErrorType::get(getContext());
+      consumeError(secondOrError.takeError());
+    } else {
+      fatal(secondOrError.takeError());
+    }
+    auto thirdOrError = getDeclChecked(*rawIDIter++);
+    TypeDecl *third;
+    if (thirdOrError) {
+      third = cast_or_null<TypeDecl>(*thirdOrError);
+    } else if (getContext().LangOpts.EnableDeserializationRecovery) {
+      third = nullptr;
+      consumeError(thirdOrError.takeError());
+    } else {
+      fatal(thirdOrError.takeError());
+    }
     if (third &&
         isa<TypeAliasDecl>(third) &&
         third->getModuleContext() != getAssociatedModule() &&

test/Serialization/Recovery/Inputs/protocol-requirement-in-implementation-only/module.modulemap

@@ -0,0 +1 @@
+module public_lib [system] {}

test/Serialization/Recovery/protocol-requirement-in-implementation-only.swift

@@ -0,0 +1,29 @@
+// RUN: %empty-directory(%t)
+
+//// Build the private module and the public module normally.
+//// Force the public module to be system with an underlying Clang module.
+// RUN: %target-swift-frontend -emit-module -DPRIVATE_LIB %s -module-name private_lib -emit-module-path %t/private_lib.swiftmodule
+// RUN: %target-swift-frontend -emit-module -DPUBLIC_LIB %s -module-name public_lib -emit-module-path %t/public_lib.swiftmodule -I %t -I %S/Inputs/protocol-requirement-in-implementation-only -import-underlying-module
+
+//// Printing the public module should not crash when reading the HiddenStruct typealias in `M`.
+// RUN: %target-swift-ide-test -print-module -module-to-print=public_lib -source-filename=x -skip-overrides -I %t
+
+#if PRIVATE_LIB
+
+public struct HiddenStruct {
+  public init() {}
+}
+
+#elseif PUBLIC_LIB
+
+@_implementationOnly import private_lib
+
+protocol SomeProtocol {
+  associatedtype Value
+  static var defaultValue: Value { get }
+}
+public struct M: SomeProtocol {
+  typealias Value = HiddenStruct
+  static let defaultValue = HiddenStruct()
+}
+#endif