Merge pull request swiftlang#38061 from ahoppen/pr-5.5/solutions-scoring

[5.5][Sema] Use different solution vectors for `ComponentStep`s created by `DependentComponentSplitterStep`

Author: akyrtzi

lib/Sema/CSStep.cpp

@@ -282,18 +282,22 @@ StepResult DependentComponentSplitterStep::take(bool prevFailed) {
     for (auto index : swift::indices(indices)) {
       dependsOnSolutions.push_back(&(*dependsOnSets[index])[indices[index]]);
     }
+    ContextualSolutions.push_back(std::make_unique<SmallVector<Solution, 2>>());
 
-    followup.push_back(
-        std::make_unique<ComponentStep>(CS, Index, Constraints, Component,
-                                         std::move(dependsOnSolutions),
-                                         Solutions));
+    followup.push_back(std::make_unique<ComponentStep>(
+        CS, Index, Constraints, Component, std::move(dependsOnSolutions),
+        *ContextualSolutions.back()));
   } while (nextCombination(dependsOnSetsRef, indices));
 
   /// Wait until all of the component steps are done.
   return suspend(followup);
 }
 
 StepResult DependentComponentSplitterStep::resume(bool prevFailed) {
+  for (auto &ComponentStepSolutions : ContextualSolutions) {
+    Solutions.append(std::make_move_iterator(ComponentStepSolutions->begin()),
+                     std::make_move_iterator(ComponentStepSolutions->end()));
+  }
   return done(/*isSuccess=*/!Solutions.empty());
 }
 

lib/Sema/CSStep.h

@@ -294,6 +294,11 @@ class DependentComponentSplitterStep final : public SolverStep {
   /// Array containing all of the partial solutions for the parent split.
   MutableArrayRef<SmallVector<Solution, 4>> AllPartialSolutions;
 
+  /// The solutions computed the \c ComponentSteps created for each partial
+  /// solution combinations. Will be merged into the final \c Solutions vector
+  /// in \c resume.
+  std::vector<std::unique_ptr<SmallVector<Solution, 2>>> ContextualSolutions;
+
   /// Take all of the constraints in this component and put them into
   /// \c Constraints.
   void injectConstraints() {

validation-test/Sema/sr14692.swift

@@ -0,0 +1,28 @@
+// RUN: %target-typecheck-verify-swift
+
+enum Foo { case foo }
+enum Bar { case bar }
+
+@resultBuilder struct ViewBuilder2 {
+  static func buildBlock(_ content: MyView) -> MyView { fatalError() }
+  static func buildIf(_ content: MyView?) -> MyView { fatalError() }
+}
+
+func makeView(@ViewBuilder2 content: () -> MyView)  { fatalError() }
+
+struct MyView {
+  init() { fatalError() }
+  
+  func qadding(bar: Foo) -> MyView { fatalError() } // expected-note{{incorrect labels for candidate (have: '(_:)', expected: '(bar:)')}}
+  func qadding(foo: Foo) -> MyView  { fatalError() } // expected-note{{incorrect labels for candidate (have: '(_:)', expected: '(foo:)')}}
+}
+
+func testCase() {
+  let array: [Int]? = []
+
+  makeView() {
+    if array?.isEmpty == false {
+      MyView().qadding(.foo) // expected-error{{no exact matches in call to instance method 'qadding'}}
+    }
+  }
+ }