---

yaml
---
r: 344507
b: refs/heads/swift-5.1-branch-08-28-2019
c: e1ac27c
h: refs/heads/master
i:
  344505: c3806fa
  344503: 118f34a

Author: jckarter

[refs]

@@ -1508,4 +1508,4 @@ refs/heads/revert-27301-syntaxparse-associatedtype: 859f90afc1557bf5600de108927b
 refs/heads/shahmishal/pr-test-swift: 868c7a884713b910757f2f3d4c413e395aeba76c
 refs/heads/shahmishal/pr-test-swift-2: fa33242bb6401b5206e2e3ce50624febfc469625
 refs/heads/swift-5.1-branch-07-24-2019: 0450b7d81e75701c325138e6af52d470bb3dafdd
-refs/heads/swift-5.1-branch-08-28-2019: ed27f9f9cec5831968b29451078e5929ad1bd415
+refs/heads/swift-5.1-branch-08-28-2019: e1ac27c5c180bf6817cca3d43d429a8717a45eb7

branches/swift-5.1-branch-08-28-2019/lib/AST/ASTContext.cpp

@@ -4382,6 +4382,14 @@ OpaqueTypeArchetypeType::get(OpaqueTypeDecl *Decl,
   auto opaqueInterfaceTy = Decl->getUnderlyingInterfaceType();
   auto layout = signature->getLayoutConstraint(opaqueInterfaceTy);
   auto superclass = signature->getSuperclassBound(opaqueInterfaceTy);
+  #if !DO_IT_CORRECTLY
+    // Ad-hoc substitute the generic parameters of the superclass.
+    // If we correctly applied the substitutions to the generic signature
+    // constraints above, this would be unnecessary.
+    if (superclass && superclass->hasTypeParameter()) {
+      superclass = superclass.subst(Substitutions);
+    }
+  #endif
   SmallVector<ProtocolDecl*, 4> protos;
   for (auto proto : signature->getConformsTo(opaqueInterfaceTy)) {
     protos.push_back(proto);

branches/swift-5.1-branch-08-28-2019/lib/AST/Attr.cpp

@@ -1073,8 +1073,15 @@ const AvailableAttr *AvailableAttr::isUnavailable(const Decl *D) {
     return attr;
 
   // If D is an extension member, check if the extension is unavailable.
-  if (auto ext = dyn_cast<ExtensionDecl>(D->getDeclContext()))
-    return AvailableAttr::isUnavailable(ext);
+  //
+  // Skip decls imported from Clang, they could be associated to the wrong
+  // extension and inherit undesired unavailability. The ClangImporter
+  // associates Objective-C protocol members to the first category where the
+  // protocol is directly or indirectly adopted, no matter its availability
+  // and the availability of other categories. rdar://problem/53956555
+  if (!D->getClangNode())
+    if (auto ext = dyn_cast<ExtensionDecl>(D->getDeclContext()))
+        return AvailableAttr::isUnavailable(ext);
 
   return nullptr;
 }

branches/swift-5.1-branch-08-28-2019/lib/Sema/TypeCheckGeneric.cpp

@@ -231,6 +231,9 @@ Type TypeChecker::getOrCreateOpaqueResultType(TypeResolution resolution,
              diag::opaque_type_invalid_constraint);
     return constraintTypeLoc.getType();
   }
+  
+  if (constraintType->hasArchetype())
+    constraintType = constraintType->mapTypeOutOfContext();
 
   // Create a generic signature for the opaque environment. This is the outer
   // generic signature with an added generic parameter representing the opaque

branches/swift-5.1-branch-08-28-2019/test/ClangImporter/Inputs/availability_platform_categories.h

@@ -0,0 +1,19 @@
+#import <Foundation/Foundation.h>
+
+@interface SharedInterface
+@end
+
+@protocol SharedProtocol <NSObject>
++ (NSInteger)foo;
+@end
+
+// ClangImporter imports the first category as the extension parent of
+// SharedInterface.foo, making foo unavailable on macOS when the extension
+// unavailability is inherited by its members.
+API_UNAVAILABLE(macos)
+@interface SharedInterface (IOSCategory) <SharedProtocol>
+@end
+
+API_UNAVAILABLE(ios)
+@interface SharedInterface (MacOSCategory) <SharedProtocol>
+@end

branches/swift-5.1-branch-08-28-2019/test/ClangImporter/availability_platform_categories.swift

@@ -0,0 +1,8 @@
+// RUN: %target-swift-frontend -typecheck %s -import-objc-header %S/Inputs/availability_platform_categories.h
+
+// REQUIRES: OS=macos
+
+// Test when a function is associated to an Objective-C category with the
+// wrong unavailability. rdar://problem/53956555
+
+print(SharedInterface.foo())

branches/swift-5.1-branch-08-28-2019/test/type/opaque_generic_superclass_constraint.swift

@@ -0,0 +1,28 @@
+// RUN: %target-swift-frontend -disable-availability-checking -emit-ir -verify %s
+
+// rdar://problem/53318811
+
+class Foo<T> {
+  var x: T { fatalError() }
+}
+
+func foo<T>(_: T) -> some Foo<T> {
+  let localProp: some Foo<T> = Foo()
+  return localProp
+}
+
+class C<T> {
+  func bar() -> some Foo<T> {
+    return Foo()
+  }
+
+  var prop: some Foo<T> = Foo()
+}
+
+func bar() -> Int {
+  var x = 0
+  x = foo(0).x
+  x = C<Int>().bar().x
+  x = C<Int>().prop.x
+  return x
+}