---

yaml
---
r: 343486
b: refs/heads/master-rebranch
c: 5d04df0
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: 535364c0300c2323a9330a675e308f575be40ba9
+refs/heads/master-rebranch: 5d04df013a0ab138403d12d3d14ae59a3777e84a
 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

@@ -2106,8 +2106,7 @@ diagnoseMatch(ModuleDecl *module, NormalProtocolConformance *conformance,
       }
       diag.fixItRemove(loc);
     } else {
-      diag.fixItInsert(witness->getAttributeInsertionLoc(true),
-                       getTokenText(tok::kw_static));
+      diag.fixItInsert(witness->getAttributeInsertionLoc(true), "static ");
     }
     break;
   }