---

yaml
---
r: 343484
b: refs/heads/master-rebranch
c: 4c8450e
h: refs/heads/master

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: 37ffd6ba1b87634348f265f880be55a456944940
+refs/heads/master-rebranch: 4c8450e3a96912142893e7d807671223b03f4d53
 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

@@ -2129,6 +2129,8 @@ diagnoseMatch(ModuleDecl *module, NormalProtocolConformance *conformance,
     auto diag = diags.diagnose(
         witness, diag::protocol_witness_prefix_postfix_conflict, false,
         witness->getAttrs().hasAttribute<PostfixAttr>() ? 2 : 0);
+    // We already emit a fix-it when we're missing the attribute, so only
+    // emit a fix-it if the attribute is there, but is not correct.
     if (auto attr = witness->getAttrs().getAttribute<PostfixAttr>()) {
       diag.fixItReplace(attr->getLocation(), "prefix");
     }
@@ -2140,6 +2142,8 @@ diagnoseMatch(ModuleDecl *module, NormalProtocolConformance *conformance,
     auto diag = diags.diagnose(
         witness, diag::protocol_witness_prefix_postfix_conflict, true,
         witness->getAttrs().hasAttribute<PrefixAttr>() ? 1 : 0);
+    // We already emit a fix-it when we're missing the attribute, so only
+    // emit a fix-it if the attribute is there, but is not correct.
     if (auto attr = witness->getAttrs().getAttribute<PrefixAttr>()) {
       diag.fixItReplace(attr->getLocation(), "postfix");
     }