Merge pull request #78956 from ahoppen/6.1/rdar141440011

[6.1] [Serialization] Ensure we run `InheritedTypeRequest` before serializing inherited type

Author: ahoppen

lib/Serialization/Serialization.cpp

@@ -4031,7 +4031,16 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
   /// \returns the number of entries added.
   size_t addInherited(InheritedTypes inheritedEntries,
                       SmallVectorImpl<TypeID> &result) {
-    for (const auto &inherited : inheritedEntries.getEntries()) {
+    for (size_t i : inheritedEntries.getIndices()) {
+      // Ensure that we run the `InheritedTypeRequest` before getting the
+      // inherited type. We serialize the inherited type from `getEntry` rather
+      // than `getResolvedType` since the former represents a suppressed
+      // conformance as a separate bit distinct from the type, which is how we
+      // want to serialize it. We thus need to get the type to serialize using a
+      // subsequent call to `getEntry(i).getType()` (see
+      // `InheritedTypeRequest::cacheResult`).
+      (void)inheritedEntries.getResolvedType(i);
+      const InheritedEntry &inherited = inheritedEntries.getEntry(i);
       assert(!inherited.getType() || !inherited.getType()->hasArchetype());
       TypeID typeRef = S.addTypeRef(inherited.getType());
 

test/IDE/rdar141440011.swift

@@ -0,0 +1,8 @@
+public protocol MyProto {}
+public struct MyStruct: MyProto {}
+
+// RUN: %empty-directory(%t)
+// RUN: %swift -emit-module -o %t/swift_mod.swiftmodule %s -parse-as-library -experimental-skip-all-function-bodies -experimental-skip-non-exportable-decls -experimental-lazy-typecheck -target %target-triple
+// RUN: %target-swift-synthesize-interface -module-name swift_mod -I %t -o - -target %target-triple | %FileCheck %s
+
+// CHECK: public struct MyStruct : swift_mod.MyProto

test/Serialization/AllowErrors/invalid-inheritance.swift

@@ -27,13 +27,13 @@ extension SomeStruct: undefined {} // expected-error {{cannot find type 'undefin
 extension SomeEnum: undefined {} // expected-error {{cannot find type 'undefined'}}
 
 extension undefined {} // expected-error {{cannot find type 'undefined'}}
-extension undefined: undefined {} // expected-error {{cannot find type 'undefined'}}
+extension undefined: undefined {} // expected-error 2 {{cannot find type 'undefined'}}
 extension undefined: SomeProto {} // expected-error {{cannot find type 'undefined'}}
 
 public extension undefined { // expected-error {{cannot find type 'undefined' in scope}}
   protocol SomeProtoInner: undefined {} // expected-error {{cannot find type 'undefined' in scope}}
-  class SomeClassInner: undefined {}
-  struct SomeStructInner: undefined {}
+  class SomeClassInner: undefined {} // expected-error {{cannot find type 'undefined' in scope}}
+  struct SomeStructInner: undefined {} // expected-error {{cannot find type 'undefined' in scope}}
   enum SomeEnumInner: undefined { // expected-error {{cannot find type 'undefined' in scope}}
     case a
   }