---

yaml
---
r: 323551
b: refs/heads/tensorflow-next
c: 9c0a348
h: refs/heads/master
i:
  323549: 69b12d0
  323547: f9138d8
  323543: f6ff6f7
  323535: abb8172
  323519: b81473b

Author: swift-ci

[refs]

@@ -1461,4 +1461,4 @@ refs/heads/master-rebranch: 86e95c23aa0d37f24ec138b7853146c1cead2e40
 refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
 refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
 refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec
-refs/heads/tensorflow-next: 141b5e011ca8967398a51833d887075da84aeea1
+refs/heads/tensorflow-next: 9c0a3483433e312f21601ce9ff9b2a034cf8d29e

branches/tensorflow-next/lib/Sema/TypeCheckAttr.cpp

@@ -2163,6 +2163,9 @@ static FuncDecl *findReplacedAccessor(DeclName replacedVarName,
     Type replacementStorageType = getDynamicComparisonType(replacementStorage);
     results.erase(std::remove_if(results.begin(), results.end(),
         [&](ValueDecl *result) {
+          // Protocol requirements are not replaceable.
+          if (isa<ProtocolDecl>(result->getDeclContext()))
+            return true;
           // Check for static/instance mismatch.
           if (result->isStatic() != replacementStorage->isStatic())
             return true;
@@ -2244,9 +2247,13 @@ findReplacedFunction(DeclName replacedFunctionName,
   lookupReplacedDecl(replacedFunctionName, attr, replacement, results);
 
   for (auto *result : results) {
+    // Protocol requirements are not replaceable.
+    if (isa<ProtocolDecl>(result->getDeclContext()))
+      continue;
     // Check for static/instance mismatch.
     if (result->isStatic() != replacement->isStatic())
       continue;
+
     if (TC)
       TC->validateDecl(result);
     TypeMatchOptions matchMode = TypeMatchFlags::AllowABICompatible;

branches/tensorflow-next/test/attr/Inputs/dynamicReplacementC.swift

@@ -13,3 +13,23 @@ public class K {
   public convenience init(c : Int) { self.init(i : c) }
   public final func finalFunction() {}
 }
+
+
+public protocol P {
+  var v: Int { get }
+  subscript(i: Int) -> Int { get }
+  func f()
+}
+
+extension P {
+  public var v: Int { return 0 }
+
+  public subscript(i: Int) -> Int {
+    get {
+      return 0
+    }
+  }
+
+  public func f() {
+  }
+}

branches/tensorflow-next/test/attr/dynamicReplacement.swift

@@ -57,3 +57,21 @@ extension undeclared { // expected-error{{use of undeclared type 'undeclared'}}
   @_dynamicReplacement(for: func) // expected-error{{replaced function 'func' could not be found}}
   func func2() -> Int { return 2 }
 }
+
+extension P {
+  @_dynamicReplacement(for: v)
+  var replacement_v : Int {
+    return 1
+  }
+
+  @_dynamicReplacement(for: subscript(_:))
+  subscript(y y: Int) -> Int {
+    get {
+      return 1
+    }
+  }
+
+  @_dynamicReplacement(for: f())
+  func replacement_f() {
+  }
+}