Merge pull request #39031 from xedin/fix-uninit-var-pattern-binding

[ConstraintSystem] Store pattern binding associated with uninitialize…

Author: xedin

include/swift/Sema/ConstraintSystem.h

@@ -1632,6 +1632,7 @@ class SolutionApplicationTarget {
     } caseLabelItem;
 
     struct {
+      PatternBindingDecl *binding;
       /// Index into pattern binding declaration (if any).
       unsigned index;
       PointerUnion<VarDecl *, Pattern *> declaration;
@@ -1688,10 +1689,11 @@ class SolutionApplicationTarget {
   SolutionApplicationTarget(VarDecl *uninitializedWrappedVar)
       : kind(Kind::uninitializedVar) {
     if (auto *PDB = uninitializedWrappedVar->getParentPatternBinding()) {
-      patternBinding = PDB;
+      uninitializedVar.binding = PDB;
       uninitializedVar.index =
           PDB->getPatternEntryIndexForVarDecl(uninitializedWrappedVar);
     } else {
+      uninitializedVar.binding = nullptr;
       uninitializedVar.index = 0;
     }
 
@@ -1702,9 +1704,7 @@ class SolutionApplicationTarget {
   SolutionApplicationTarget(PatternBindingDecl *binding, unsigned index,
                             Pattern *var, Type patternTy)
       : kind(Kind::uninitializedVar) {
-    assert(patternBinding);
-
-    patternBinding = binding;
+    uninitializedVar.binding = binding;
     uninitializedVar.index = index;
     uninitializedVar.declaration = var;
     uninitializedVar.type = patternTy;
@@ -1781,7 +1781,7 @@ class SolutionApplicationTarget {
               uninitializedVar.declaration.dyn_cast<VarDecl *>())
         return wrappedVar->getDeclContext();
 
-      return patternBinding->getInitContext(uninitializedVar.index);
+      return uninitializedVar.binding->getInitContext(uninitializedVar.index);
     }
     }
     llvm_unreachable("invalid decl context type");
@@ -2072,7 +2072,7 @@ class SolutionApplicationTarget {
       return nullptr;
 
     case Kind::uninitializedVar:
-      return patternBinding;
+      return uninitializedVar.binding;
     }
     llvm_unreachable("invalid case label type");
   }