[ConstraintSytem] NFC: Remove unnecessary checking/counting from countDistinctOverloads

xedin · xedin · commit 84b212cc2337 · 2023-05-18T17:02:59.000-07:00
diff --git a/lib/Sema/ConstraintSystem.cpp b/lib/Sema/ConstraintSystem.cpp
@@ -5302,12 +5302,10 @@ bool ConstraintSystem::diagnoseAmbiguityWithFixes(
 /// provided set.
 static unsigned countDistinctOverloads(ArrayRef<OverloadChoice> choices) {
   llvm::SmallPtrSet<void *, 4> uniqueChoices;
-  unsigned result = 0;
   for (auto choice : choices) {
-    if (uniqueChoices.insert(choice.getOpaqueChoiceSimple()).second)
-      ++result;
+    uniqueChoices.insert(choice.getOpaqueChoiceSimple());
   }
-  return result;
+  return uniqueChoices.size();
 }
 
 /// Determine the name of the overload in a set of overload choices.

Original file line number	Diff line number	Diff line change
`@@ -5302,12 +5302,10 @@ bool ConstraintSystem::diagnoseAmbiguityWithFixes(`
`5302`	`5302`	`/// provided set.`
`5303`	`5303`	`static unsigned countDistinctOverloads(ArrayRef<OverloadChoice> choices) {`
`5304`	`5304`	`llvm::SmallPtrSet<void *, 4> uniqueChoices;`
`5305`		`- unsigned result = 0;`
`5306`	`5305`	`for (auto choice : choices) {`
`5307`		`- if (uniqueChoices.insert(choice.getOpaqueChoiceSimple()).second)`
`5308`		`- ++result;`
	`5306`	`+ uniqueChoices.insert(choice.getOpaqueChoiceSimple());`
`5309`	`5307`	`}`
`5310`		`- return result;`
	`5308`	`+ return uniqueChoices.size();`
`5311`	`5309`	`}`
`5312`	`5310`
`5313`	`5311`	`/// Determine the name of the overload in a set of overload choices.`