Merge pull request #38339 from xedin/fix-clone-propagate-remember-choice

xedin · web-flow · commit a34d75706eed · 2021-07-12T09:50:09.000-07:00
[ConstraintSystem] Fix handling of whether choice should be remembere…
diff --git a/lib/Sema/Constraint.cpp b/lib/Sema/Constraint.cpp
@@ -303,7 +303,9 @@ Constraint *Constraint::clone(ConstraintSystem &cs) const {
         getMemberUseDC(), getFunctionRefKind(), getLocator());
 
   case ConstraintKind::Disjunction:
-    return createDisjunction(cs, getNestedConstraints(), getLocator());
+    return createDisjunction(
+        cs, getNestedConstraints(), getLocator(),
+        static_cast<RememberChoice_t>(shouldRememberChoice()));
 
   case ConstraintKind::KeyPath:
   case ConstraintKind::KeyPathApplication:
