Merge remote-tracking branch 'origin/master' into master-next

swift-ci · swift-ci · commit 341095505635 · 2020-05-30T00:38:55.000-07:00
diff --git a/lib/Sema/ConstraintSystem.cpp b/lib/Sema/ConstraintSystem.cpp
@@ -4530,6 +4530,8 @@ SourceLoc constraints::getLoc(ASTNode anchor) {
     if (auto VD = dyn_cast<VarDecl>(V))
       return VD->getNameLoc();
     return anchor.getStartLoc();
+  } else if (auto *S = anchor.dyn_cast<Stmt *>()) {
+    return S->getStartLoc();
   } else {
     return anchor.get<Pattern *>()->getLoc();
   }

Original file line number	Diff line number	Diff line change
`@@ -4530,6 +4530,8 @@ SourceLoc constraints::getLoc(ASTNode anchor) {`
`4530`	`4530`	`if (auto VD = dyn_cast<VarDecl>(V))`
`4531`	`4531`	`return VD->getNameLoc();`
`4532`	`4532`	`return anchor.getStartLoc();`
	`4533`	`+ } else if (auto S = anchor.dyn_cast<Stmt >()) {`
	`4534`	`+ return S->getStartLoc();`
`4533`	`4535`	`} else {`
`4534`	`4536`	`return anchor.get<Pattern *>()->getLoc();`
`4535`	`4537`	`}`