Visit var/subscript opaque return decls during IRGen/TBDGen.

Author: jckarter

lib/IRGen/GenDecl.cpp

@@ -1817,8 +1817,8 @@ void IRGenModule::emitGlobalDecl(Decl *D) {
       DebugInfo->emitImport(cast<ImportDecl>(D));
     return;
 
-  // We emit these as part of the PatternBindingDecl.
   case DeclKind::Var:
+    emitAbstractStorageDecl(cast<AbstractStorageDecl>(D));
     return;
 
   case DeclKind::Accessor:
@@ -3724,6 +3724,9 @@ void IRGenModule::emitNestedTypeDecls(DeclRange members) {
 
     case DeclKind::Var:
     case DeclKind::Subscript:
+      emitAbstractStorageDecl(cast<AbstractStorageDecl>(member));
+      continue;
+        
     case DeclKind::PatternBinding:
     case DeclKind::Accessor:
     case DeclKind::Constructor:

lib/IRGen/GenStruct.cpp

@@ -887,6 +887,14 @@ void IRGenModule::emitFuncDecl(FuncDecl *fd) {
   }
 }
 
+void IRGenModule::emitAbstractStorageDecl(AbstractStorageDecl *fd) {
+  // If there's an opaque return type for this function, emit its descriptor.
+  if (auto opaque = fd->getOpaqueResultTypeDecl()) {
+    if (!IRGen.hasLazyMetadata(opaque))
+      emitOpaqueTypeDecl(opaque);
+  }
+}
+
 namespace {
   /// A type implementation for resilient struct types. This is not a
   /// StructTypeInfoBase at all, since we don't know anything about

lib/IRGen/IRGenModule.h

@@ -1202,6 +1202,7 @@ private:                            \
   void emitClassDecl(ClassDecl *D);
   void emitExtension(ExtensionDecl *D);
   void emitFuncDecl(FuncDecl *D);
+  void emitAbstractStorageDecl(AbstractStorageDecl *D);
   void emitOpaqueTypeDecl(OpaqueTypeDecl *D);
   void emitSILGlobalVariable(SILGlobalVariable *gv);
   void emitCoverageMapping();

lib/TBDGen/TBDGen.cpp

@@ -232,8 +232,9 @@ void TBDGenVisitor::visitAbstractFunctionDecl(AbstractFunctionDecl *AFD) {
 
 void TBDGenVisitor::visitFuncDecl(FuncDecl *FD) {
   // If there's an opaque return type, its descriptor is exported.
-  if (auto opaqueResult = FD->getOpaqueResultTypeDecl())
+  if (auto opaqueResult = FD->getOpaqueResultTypeDecl()) {
     addSymbol(LinkEntity::forOpaqueTypeDescriptor(opaqueResult));
+  }
   visitAbstractFunctionDecl(FD);
 }
 
@@ -249,6 +250,11 @@ void TBDGenVisitor::visitAbstractStorageDecl(AbstractStorageDecl *ASD) {
   if (ASD->exportsPropertyDescriptor()) {
     addSymbol(LinkEntity::forPropertyDescriptor(ASD));
   }
+  
+  // ...and the opaque result decl if it has one.
+  if (auto opaqueResult = ASD->getOpaqueResultTypeDecl()) {
+    addSymbol(LinkEntity::forOpaqueTypeDescriptor(opaqueResult));
+  }
 
   // Explicitly look at each accessor here: see visitAccessorDecl.
   for (auto accessor : ASD->getAllAccessors()) {

test/IRGen/opaque_result_type.swift

@@ -2,10 +2,10 @@
 // RUN: %{python} %utils/chex.py < %s > %t/opaque_result_type.swift
 // RUN: %target-swift-frontend -emit-ir %t/opaque_result_type.swift | %FileCheck --check-prefix=CHECK --check-prefix=CHECK-NODEBUG %t/opaque_result_type.swift
 
-protocol O {
+public protocol O {
   func bar()
 }
-protocol O2 {
+public protocol O2 {
   func baz()
 }
 
@@ -21,12 +21,12 @@ protocol Q: AnyObject {
 }
 
 extension Int: O, O2 {
-  func bar() {}
-  func baz() {}
+  public func bar() {}
+  public func baz() {}
 }
 
 extension String: P {
-  // CHECK-LABEL: @"$sSS18opaque_result_typeE3pooQryFQOMQ" = {{.*}} constant <{ {{.*}} }> <{
+  // CHECK-LABEL: @"$sSS18opaque_result_typeE3pooQryFQOMQ" = {{.*}}constant <{ {{.*}} }> <{
   // -- header: opaque type context (0x4), generic (0x80), unique (0x40), two entries (0x2_0000)
   // CHECK-SAME:         <i32 0x2_00c4>,
   // -- parent context: module, or anon context for function
@@ -39,6 +39,21 @@ extension String: P {
   func poo() -> some O {
     return 0
   }
+
+  // CHECK-LABEL: @"$sSS18opaque_result_typeE4propQrvpQOMQ" = {{.*}}constant
+  public var prop: some O {
+    return 0
+  }
+
+  // CHECK-LABEL: @"$sSS18opaque_result_typeEQrycipQOMQ" = {{.*}}constant
+  public subscript() -> some O {
+    return 0
+  }
+}
+
+// CHECK-LABEL: @"$s18opaque_result_type10globalPropQrvpQOMQ" = {{.*}}constant
+public var globalProp: some O {
+  return 0
 }
 
 public class C: P, Q {

test/TBD/opaque_result_type.swift

@@ -24,6 +24,10 @@ extension Int: O, O2 {
   public func baz() {}
 }
 
+public var globalProp: some O {
+  return 0
+}
+
 public class C: P, Q {
   public func poo() -> some O {
     return 0
@@ -32,6 +36,14 @@ public class C: P, Q {
   public func qoo() -> some O & O2 {
     return 0
   }
+
+  public var prop: some O {
+    return 0
+  }
+
+  public subscript() -> some O {
+    return 0
+  }
 }
 
 public func foo(x: String) -> some P {