Merge pull request #80750 from xedin/prune-should-skip-already-disabled

[CSStep] Overload pruning should skip previously disabled choices

Author: xedin

lib/Sema/CSStep.h

@@ -708,6 +708,9 @@ class DisjunctionStep final : public BindingStep<DisjunctionChoiceProducer> {
       // Disable all of the overload choices which are different from
       // the one which is currently picked for representative.
       for (auto *constraint : disjunction->getNestedConstraints()) {
+        if (constraint->isDisabled())
+          continue;
+
         auto choice = constraint->getOverloadChoice();
         if (!choice.isDecl() || choice.getDecl() == representative.getDecl())
           continue;