---

yaml
---
r: 345945
b: refs/heads/master
c: 3cd7f2f
h: refs/heads/master
i:
  345943: 570c26c

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 9943d27da2fe5e9a2666365d71924500e89e30f8
+refs/heads/master: 3cd7f2f7b46151b78bc95b72523de5c3d459d72f
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/Sema/TypeCheckProtocol.cpp

@@ -1322,6 +1322,13 @@ RequirementCheck WitnessChecker::checkWitness(ValueDecl *requirement,
     return RequirementCheck(kind, getRequiredAccessScope());
   }
 
+  if (isUsableFromInlineRequired()) {
+    bool witnessIsUsableFromInline = match.Witness->getFormalAccessScope(
+        DC, /*usableFromInlineAsPublic*/true).isPublic();
+    if (!witnessIsUsableFromInline)
+      return CheckKind::UsableFromInline;
+  }
+
   auto requiredAvailability = AvailabilityContext::alwaysAvailable();
   if (checkWitnessAvailability(requirement, match.Witness,
                                &requiredAvailability)) {
@@ -3067,6 +3074,10 @@ ConformanceChecker::resolveWitnessViaLookup(ValueDecl *requirement) {
       break;
     }
 
+    case CheckKind::UsableFromInline:
+      diagnoseOrDefer(requirement, false, DiagnoseUsableFromInline(witness));
+      break;
+
     case CheckKind::Availability: {
       diagnoseOrDefer(requirement, false,
         [witness, requirement, check](

trunk/lib/Sema/TypeCheckProtocol.h

@@ -252,6 +252,9 @@ enum class CheckKind : unsigned {
   /// requirement.
   AccessOfSetter,
 
+  /// The witness needs to be @usableFromInline.
+  UsableFromInline,
+
   /// The witness is less available than the requirement.
   Availability,
 

trunk/test/Compatibility/attr_usableFromInline_protocol.swift

@@ -8,16 +8,19 @@ public protocol PublicProtoWithReqs {
 
 @usableFromInline struct UFIAdopter<T> : PublicProtoWithReqs {}
 // expected-warning@-1 {{type alias 'Assoc' should be declared '@usableFromInline' because because it matches a requirement in protocol 'PublicProtoWithReqs'}} {{none}}
+// expected-warning@-2 {{instance method 'foo()' should be declared '@usableFromInline' because because it matches a requirement in protocol 'PublicProtoWithReqs'}} {{none}}
 extension UFIAdopter {
   typealias Assoc = Int
   // expected-note@-1 {{'Assoc' declared here}}
   func foo() {}
+  // expected-note@-1 {{'foo()' declared here}}
 }
 
 @usableFromInline struct UFIAdopterAllInOne<T> : PublicProtoWithReqs {
   typealias Assoc = Int
   // expected-warning@-1 {{type alias 'Assoc' should be declared '@usableFromInline' because because it matches a requirement in protocol 'PublicProtoWithReqs'}} {{none}}
   func foo() {}
+  // expected-warning@-1 {{instance method 'foo()' should be declared '@usableFromInline' because because it matches a requirement in protocol 'PublicProtoWithReqs'}} {{none}}
 }
 
 internal struct InternalAdopter<T> : PublicProtoWithReqs {}
@@ -34,9 +37,11 @@ extension InternalAdopter {
 
 public struct PublicAdopter<T> : UFIProtoWithReqs {}
 // expected-warning@-1 {{type alias 'Assoc' should be declared '@usableFromInline' because because it matches a requirement in protocol 'UFIProtoWithReqs'}} {{none}}
+// expected-warning@-2 {{instance method 'foo()' should be declared '@usableFromInline' because because it matches a requirement in protocol 'UFIProtoWithReqs'}} {{none}}
 extension PublicAdopter {
   typealias Assoc = Int
   // expected-note@-1 {{'Assoc' declared here}}
   func foo() {}
+  // expected-note@-1 {{'foo()' declared here}}
 }
 extension InternalAdopter: UFIProtoWithReqs {} // okay

trunk/test/attr/attr_usableFromInline_protocol.swift

@@ -8,16 +8,19 @@ public protocol PublicProtoWithReqs {
 
 @usableFromInline struct UFIAdopter<T> : PublicProtoWithReqs {}
 // expected-error@-1 {{type alias 'Assoc' must be declared '@usableFromInline' because because it matches a requirement in protocol 'PublicProtoWithReqs'}} {{none}}
+// expected-error@-2 {{instance method 'foo()' must be declared '@usableFromInline' because because it matches a requirement in protocol 'PublicProtoWithReqs'}} {{none}}
 extension UFIAdopter {
   typealias Assoc = Int
   // expected-note@-1 {{'Assoc' declared here}}
   func foo() {}
+  // expected-note@-1 {{'foo()' declared here}}
 }
 
 @usableFromInline struct UFIAdopterAllInOne<T> : PublicProtoWithReqs {
   typealias Assoc = Int
   // expected-error@-1 {{type alias 'Assoc' must be declared '@usableFromInline' because because it matches a requirement in protocol 'PublicProtoWithReqs'}} {{none}}
   func foo() {}
+  // expected-error@-1 {{instance method 'foo()' must be declared '@usableFromInline' because because it matches a requirement in protocol 'PublicProtoWithReqs'}} {{none}}
 }
 
 internal struct InternalAdopter<T> : PublicProtoWithReqs {}
@@ -34,9 +37,11 @@ extension InternalAdopter {
 
 public struct PublicAdopter<T> : UFIProtoWithReqs {}
 // expected-error@-1 {{type alias 'Assoc' must be declared '@usableFromInline' because because it matches a requirement in protocol 'UFIProtoWithReqs'}} {{none}}
+// expected-error@-2 {{instance method 'foo()' must be declared '@usableFromInline' because because it matches a requirement in protocol 'UFIProtoWithReqs'}} {{none}}
 extension PublicAdopter {
   typealias Assoc = Int
   // expected-note@-1 {{'Assoc' declared here}}
   func foo() {}
+  // expected-note@-1 {{'foo()' declared here}}
 }
 extension InternalAdopter: UFIProtoWithReqs {} // okay