---

yaml
---
r: 343485
b: refs/heads/master-rebranch
c: 535364c
h: refs/heads/master
i:
  343483: fa2bb09

Author: theblixguy

[refs]

@@ -1455,7 +1455,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
 refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
 refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
-refs/heads/master-rebranch: 4c8450e3a96912142893e7d807671223b03f4d53
+refs/heads/master-rebranch: 535364c0300c2323a9330a675e308f575be40ba9
 refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
 refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
 refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec

branches/master-rebranch/lib/Sema/TypeCheckProtocol.cpp

@@ -2116,10 +2116,11 @@ diagnoseMatch(ModuleDecl *module, NormalProtocolConformance *conformance,
     auto witness = match.Witness;
     auto diag =
         diags.diagnose(witness, diag::protocol_witness_settable_conflict);
-    auto VD = cast<VarDecl>(witness);
-    if (VD->hasStorage()) {
-      auto PBD = VD->getParentPatternBinding();
-      diag.fixItReplace(PBD->getStartLoc(), getTokenText(tok::kw_var));
+    if (auto VD = dyn_cast<VarDecl>(witness)) {
+      if (VD->hasStorage()) {
+        auto PBD = VD->getParentPatternBinding();
+        diag.fixItReplace(PBD->getStartLoc(), getTokenText(tok::kw_var));
+      }
     }
     break;
   }
@@ -2166,7 +2167,7 @@ diagnoseMatch(ModuleDecl *module, NormalProtocolConformance *conformance,
   case MatchKind::RethrowsConflict: {
     auto witness = match.Witness;
     auto diag =
-        diags.diagnose(match.Witness, diag::protocol_witness_rethrows_conflict);
+        diags.diagnose(witness, diag::protocol_witness_rethrows_conflict);
     auto FD = cast<FuncDecl>(witness);
     diag.fixItReplace(FD->getThrowsLoc(), getTokenText(tok::kw_rethrows));
     break;

branches/master-rebranch/test/decl/protocol/req/witness_fix_its.swift

@@ -26,3 +26,11 @@ struct ConformsToFoo: Foo { // expected-error {{type 'ConformsToFoo' does not co
   var bar5: Int { return 0 } // expected-note {{candidate is not settable, but protocol requires it}}{{none}}
   subscript(_ pos: Int) -> Int { return 0 } // expected-note {{candidate operates on an instance, not a type as required}}{{3-3=static}}
 }
+
+protocol Foo1 {
+  subscript(value: Bool) -> Bool { get set } // expected-note {{protocol requires subscript with type '(Bool) -> Bool'; do you want to add a stub?}}
+}
+
+struct ConformsToFoo1: Foo1 { // expected-error {{type 'ConformsToFoo1' does not conform to protocol 'Foo1'}}
+  subscript(value: Bool) -> Bool { return false } // expected-note {{candidate is not settable, but protocol requires it}}{{none}}
+}