---

yaml
---
r: 343295
b: refs/heads/master-rebranch
c: faf6ba0
h: refs/heads/master
i:
  343293: 6eeff77
  343291: 21eb460
  343287: 6fe549b
  343279: d836ca6
  343263: f2ab040
  343231: 52d306f
  343167: b57f92a
  343039: ac9f22a

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: 016e3dc4a6f4cf3032fd1357c3e7f770835d5ec0
+refs/heads/master-rebranch: faf6ba0823448d8871915afdc7917ae999b7079d
 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/CSDiagnostics.cpp

@@ -3943,16 +3943,12 @@ bool MissingContextualConformanceFailure::diagnoseAsError() {
 
   Optional<Diag<Type, Type>> diagnostic;
   if (path.empty()) {
-    if (getParentExpr() && isa<CallExpr>(getParentExpr())) {
-      diagnostic = getDiagnosticFor(CTP_CallArgument, /*forProtocol=*/true);
+    assert(isa<AssignExpr>(anchor));
+    if (isa<SubscriptExpr>(cast<AssignExpr>(anchor)->getDest())) {
+      diagnostic =
+          getDiagnosticFor(CTP_SubscriptAssignSource, /*forProtocol=*/true);
     } else {
-      assert(isa<AssignExpr>(anchor));
-      if (isa<SubscriptExpr>(cast<AssignExpr>(anchor)->getDest())) {
-        diagnostic =
-            getDiagnosticFor(CTP_SubscriptAssignSource, /*forProtocol=*/true);
-      } else {
-        diagnostic = getDiagnosticFor(CTP_AssignSource, /*forProtocol=*/true);
-      }
+      diagnostic = getDiagnosticFor(CTP_AssignSource, /*forProtocol=*/true);
     }
   } else {
     const auto &last = path.back();