Merge pull request #24338 from DougGregor/irgen-emit-lazy-opaque-descriptors-5.1

[5.1] [IRGen] Emit lazy opaque type descriptors.

Author: DougGregor

lib/IRGen/GenDecl.cpp

@@ -1082,6 +1082,7 @@ void IRGenerator::emitTypeMetadataRecords() {
 void IRGenerator::emitLazyDefinitions() {
   while (!LazyTypeMetadata.empty() ||
          !LazyTypeContextDescriptors.empty() ||
+         !LazyOpaqueTypeDescriptors.empty() ||
          !LazyFieldDescriptors.empty() ||
          !LazyFunctionDefinitions.empty() ||
          !LazyWitnessTables.empty()) {
@@ -1106,6 +1107,15 @@ void IRGenerator::emitLazyDefinitions() {
       emitLazyTypeContextDescriptor(*IGM.get(), type,
                                     RequireMetadata_t(entry.IsMetadataUsed));
     }
+    while (!LazyOpaqueTypeDescriptors.empty()) {
+      OpaqueTypeDecl *type = LazyOpaqueTypeDescriptors.pop_back_val();
+      auto &entry = LazyOpaqueTypes.find(type)->second;
+      assert(hasLazyMetadata(type));
+      assert(entry.IsDescriptorUsed && !entry.IsDescriptorEmitted);
+      entry.IsDescriptorEmitted = true;
+      CurrentIGMPtr IGM = getGenModule(type->getDeclContext());
+      IGM->emitOpaqueTypeDecl(type);
+    }
     while (!LazyFieldDescriptors.empty()) {
       NominalTypeDecl *type = LazyFieldDescriptors.pop_back_val();
       CurrentIGMPtr IGM = getGenModule(type->getDeclContext());
@@ -1266,7 +1276,10 @@ void IRGenerator::noteUseOfFieldDescriptor(NominalTypeDecl *type) {
 void IRGenerator::noteUseOfOpaqueTypeDescriptor(OpaqueTypeDecl *opaque) {
   if (!opaque)
     return;
-  
+
+  if (!hasLazyMetadata(opaque))
+    return;
+
   auto insertResult = LazyOpaqueTypes.try_emplace(opaque);
   auto &entry = insertResult.first->second;
 

lib/IRGen/IRGenModule.h

@@ -245,6 +245,7 @@ class IRGenerator {
   struct LazyOpaqueInfo {
     bool IsLazy = false;
     bool IsDescriptorUsed = false;
+    bool IsDescriptorEmitted = false;
   };
   /// The set of opaque types enqueued for lazy emission.
   llvm::DenseMap<OpaqueTypeDecl*, LazyOpaqueInfo> LazyOpaqueTypes;

test/IRGen/lazy_opaque_result_type.swift

@@ -0,0 +1,26 @@
+// RUN: %target-swift-frontend -parse-as-library -module-name=test -O -primary-file %s -emit-ir > %t.ll
+// RUN: %FileCheck %s < %t.ll
+
+protocol P { }
+
+protocol Q {
+  associatedtype AT: P
+  func getAT() -> AT
+}
+
+private struct X: Q {
+  private struct Inner: P { }
+
+  // CHECK: @"$s4test1X33_58D62B15E5EAC1447430E52C74EAD489LLV5getATQryFQOMQ" = internal constant
+  func getAT() -> some P {
+    return Inner()
+  }
+}
+
+func testMe<T: Q>(_ t: T) {
+  _ = t.getAT()
+}
+
+func doIt() {
+  testMe(X())
+}