---

yaml
---
r: 284407
b: refs/heads/swift-5.1-branch
c: 3d776bc
h: refs/heads/master
i:
  284405: 6c4d5b3
  284403: 6ec8cb6
  284399: 0b0e6de

Author: jckarter

[refs]

@@ -1242,7 +1242,7 @@ refs/heads/marcrasi-astverifier-disable: 3fac766a23a77ebd0640296bfd7fc116ea60a4e
 refs/heads/revert-22227-a-tall-white-fountain-played: adfce60b2eaa54903ea189bed8a783bca609fa53
 refs/heads/revert-22300-revert-22227-a-tall-white-fountain-played: 5f92040224df7dd4e618fdfb367349df64d8acad
 refs/heads/swift-5.1-old-llvm-branch: 9cef8175146f25b72806154b8a0f4a3f52e3e400
-refs/heads/swift-5.1-branch: 95ec05a87c6f4a468ba6d5bbcd728e799235ef2a
+refs/heads/swift-5.1-branch: 3d776bc7a91662791b77726b248f513ed705a27e
 refs/tags/swift-4.2.2-RELEASE: e429d1f1aaf59e69d38207a96e56265c7f6fccec
 refs/tags/swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-02-a: 3e5a03d32ff3b1e9af90d6c1198c14f938379a6e
 refs/tags/swift-5.0-DEVELOPMENT-SNAPSHOT-2019-02-03-a: 4591c933063ddcb0d6cd6d0cdd01086b2f9b244d

branches/swift-5.1-branch/include/swift/SIL/AbstractionPattern.h

@@ -565,11 +565,13 @@ class AbstractionPattern {
     case Kind::Type:
     case Kind::Discard: {
       auto type = getType();
-      if (isa<ArchetypeType>(type) ||
-          isa<DependentMemberType>(type) ||
+      if (isa<DependentMemberType>(type) ||
           isa<GenericTypeParamType>(type)) {
         return true;
       }
+      if (auto archetype = dyn_cast<ArchetypeType>(type)) {
+        return !isa<OpaqueTypeArchetypeType>(archetype->getRoot());
+      }
       return false;
     }
     default:

branches/swift-5.1-branch/lib/IRGen/DebugTypeInfo.cpp

@@ -80,15 +80,15 @@ DebugTypeInfo DebugTypeInfo::getMetadata(swift::Type Ty, llvm::Type *StorageTy,
                                          Size size, Alignment align) {
   DebugTypeInfo DbgTy(Ty.getPointer(), StorageTy, size,
                       align, true, false);
-  assert(!DbgTy.isArchetype() && "type metadata cannot contain an archetype");
+  assert(!DbgTy.isContextArchetype() && "type metadata cannot contain an archetype");
   return DbgTy;
 }
 
 DebugTypeInfo DebugTypeInfo::getArchetype(swift::Type Ty, llvm::Type *StorageTy,
                                           Size size, Alignment align) {
   DebugTypeInfo DbgTy(Ty.getPointer(), StorageTy, size,
                       align, true, true);
-  assert(!DbgTy.isArchetype() && "type metadata cannot contain an archetype");
+  assert(!DbgTy.isContextArchetype() && "type metadata cannot contain an archetype");
   return DbgTy;
 }
 
@@ -107,7 +107,7 @@ DebugTypeInfo DebugTypeInfo::getGlobal(SILGlobalVariable *GV,
   DebugTypeInfo DbgTy(Type, StorageTy, size, align, hasDefaultAlignment(Type),
                       false);
   assert(StorageTy && "StorageType is a nullptr");
-  assert(!DbgTy.isArchetype() &&
+  assert(!DbgTy.isContextArchetype() &&
          "type of global variable cannot be an archetype");
   assert(align.getValue() != 0);
   return DbgTy;
@@ -118,7 +118,7 @@ DebugTypeInfo DebugTypeInfo::getObjCClass(ClassDecl *theClass,
                                           Alignment align) {
   DebugTypeInfo DbgTy(theClass->getInterfaceType().getPointer(), StorageType,
                       size, align, true, false);
-  assert(!DbgTy.isArchetype() && "type of objc class cannot be an archetype");
+  assert(!DbgTy.isContextArchetype() && "type of objc class cannot be an archetype");
   return DbgTy;
 }
 

branches/swift-5.1-branch/lib/IRGen/DebugTypeInfo.h

@@ -80,9 +80,12 @@ class DebugTypeInfo {
 
   TypeDecl *getDecl() const;
 
-  // Determine whether this type is an Archetype itself.
-  bool isArchetype() const {
-    return Type->getWithoutSpecifierType()->is<ArchetypeType>();
+  // Determine whether this type is an Archetype dependent on a generic context.
+  bool isContextArchetype() const {
+    if (auto archetype = Type->getWithoutSpecifierType()->getAs<ArchetypeType>()) {
+      return !isa<OpaqueTypeArchetypeType>(archetype->getRoot());
+    }
+    return false;
   }
 
   bool isNull() const { return Type == nullptr; }

branches/swift-5.1-branch/test/IRGen/opaque_result_type_global.swift

@@ -0,0 +1,10 @@
+// RUN: %target-swift-frontend -emit-ir -verify %s
+
+// rdar://problem/49818962
+func foo() -> some Collection {
+  return [12,3]
+}
+
+let a = foo()
+
+print(a)