Merge pull request swiftlang#15056 from rudkx/bad-comparison

rudkx · web-flow · commit 63544b5e676d · 2018-03-07T17:17:11.000-08:00
Fix overload set construction to not have an extra element in the dis…
diff --git a/lib/Sema/ConstraintSystem.cpp b/lib/Sema/ConstraintSystem.cpp
@@ -1433,7 +1433,7 @@ void ConstraintSystem::addOverloadSet(Type boundType,
     overloads.push_back(bindOverloadConstraint);
   }
   
-  for (auto choice : choices) {
+  for (auto &choice : choices) {
     if (favoredChoice && (favoredChoice == &choice))
       continue;
     

Original file line number	Diff line number	Diff line change
`@@ -1433,7 +1433,7 @@ void ConstraintSystem::addOverloadSet(Type boundType,`
`1433`	`1433`	`overloads.push_back(bindOverloadConstraint);`
`1434`	`1434`	`}`
`1435`	`1435`
`1436`		`- for (auto choice : choices) {`
	`1436`	`+ for (auto &choice : choices) {`
`1437`	`1437`	`if (favoredChoice && (favoredChoice == &choice))`
`1438`	`1438`	`continue;`
`1439`	`1439`