From f5258ed9c9f344e2f974b769e9a20ae7bc079525 Mon Sep 17 00:00:00 2001
From: Slava Pestov <spestov@apple.com>
Date: Fri, 22 May 2020 22:09:40 -0400
Subject: [PATCH] ASTDemangler: Add support for member types of opaque result
 types

Fixes <rdar://problem/63188053>.
---
 lib/AST/ASTDemangler.cpp                  | 29 +++++++++++++++++------
 test/TypeDecoder/opaque_return_type.swift |  8 +++++++
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/lib/AST/ASTDemangler.cpp b/lib/AST/ASTDemangler.cpp
index 558452d3af46e..9b833d3d8ff08 100644
--- a/lib/AST/ASTDemangler.cpp
+++ b/lib/AST/ASTDemangler.cpp
@@ -609,20 +609,35 @@ Type ASTBuilder::createGenericTypeParameterType(unsigned depth,
 
 Type ASTBuilder::createDependentMemberType(StringRef member,
                                            Type base) {
-  if (!base->isTypeParameter())
-    return Type();
+  auto identifier = Ctx.getIdentifier(member);
+
+  if (auto *archetype = base->getAs<ArchetypeType>()) {
+    if (archetype->hasNestedType(identifier))
+      return archetype->getNestedType(identifier);
+
+  }
+
+  if (base->isTypeParameter()) {
+    return DependentMemberType::get(base, identifier);
+  }
 
-  return DependentMemberType::get(base, Ctx.getIdentifier(member));
+  return Type();
 }
 
 Type ASTBuilder::createDependentMemberType(StringRef member,
                                            Type base,
                                            ProtocolDecl *protocol) {
-  if (!base->isTypeParameter())
-    return Type();
+  auto identifier = Ctx.getIdentifier(member);
 
-  if (auto assocType = protocol->getAssociatedType(Ctx.getIdentifier(member)))
-    return DependentMemberType::get(base, assocType);
+  if (auto *archetype = base->getAs<ArchetypeType>()) {
+    if (archetype->hasNestedType(identifier))
+      return archetype->getNestedType(identifier);
+  }
+
+  if (base->isTypeParameter()) {
+    if (auto assocType = protocol->getAssociatedType(identifier))
+      return DependentMemberType::get(base, assocType);
+  }
 
   return Type();
 }
diff --git a/test/TypeDecoder/opaque_return_type.swift b/test/TypeDecoder/opaque_return_type.swift
index c13afa1f31a0f..94b139ad48d1e 100644
--- a/test/TypeDecoder/opaque_return_type.swift
+++ b/test/TypeDecoder/opaque_return_type.swift
@@ -10,8 +10,16 @@ extension Int: P {}
 func foo() -> some P { return 0 }
 var prop: some P { return 0 }
 
+func bar() -> some Sequence { return [] }
+
 // DEMANGLE: $s18opaque_return_type3fooQryFQOyQo_
 // CHECK: some P
 
 // DEMANGLE: $s18opaque_return_type4propQrvpQOyQo_
 // CHECK: some P
+
+// DEMANGLE: $s18opaque_return_type3barQryFQOyQo_
+// CHECK: some Sequence
+
+// DEMANGLE: $s18opaque_return_type3barQryFQOyQo_7ElementSTQxD
+// CHECK: (some Sequence).Element