Get copy init for tuple unpack assignment working

Signed-off-by: Anna Rift <[email protected]>

Author: arifthpe

frontend/lib/resolution/call-init-deinit.cpp

@@ -551,7 +551,7 @@ void CallInitDeinit::resolveDefaultInit(const VarLikeDecl* ast, RV& rv) {
   }
 }
 
-// Adjusts LHS tuple type so that its components are all references.
+// Adjusts LHS tuple type so that its components are all values.
 // Does no sanity checks.
 static QualifiedType
 getLhsForTupleUnpackAssign(Context* context,
@@ -576,7 +576,7 @@ getLhsForTupleUnpackAssign(Context* context,
     } else {
       // Otherwise, turn its qualifier into 'ref' / 'const ref'
       auto eqt = lhsT->elementType(i);
-      auto kind = KindProperties::addRefness(eqt.kind());
+      auto kind = KindProperties::removeRef(eqt.kind());
       qt = { kind, eqt.type(), eqt.param() };
     }
 
@@ -596,6 +596,8 @@ void CallInitDeinit::resolveTupleUnpackAssign(const Tuple* lhsTuple,
                                               const QualifiedType& initialLhsType,
                                               const QualifiedType& rhsType,
                                               RV& rv) {
+  VarFrame* frame = currentFrame();
+
   // Make sure that both the LHS and RHS have types
   if (!initialLhsType.hasTypePtr()) {
     context->error(lhsTuple, "Unknown lhs tuple type in split tuple assign");
@@ -626,9 +628,6 @@ void CallInitDeinit::resolveTupleUnpackAssign(const Tuple* lhsTuple,
     return;
   }
 
-  // Then, make sure that the LHS is valid and adjust its intent.
-  // It recomputes the LHS tuple type and sets it in 'byPostorder'.
-  // It does not recompute intents for component sub-expressions.
   auto lhsType = getLhsForTupleUnpackAssign(context, astForErr, lhsTuple,
                                             initialLhsType);
   rv.byPostorder().byAst(lhsTuple).setType(lhsType);
@@ -651,7 +650,7 @@ void CallInitDeinit::resolveTupleUnpackAssign(const Tuple* lhsTuple,
       continue;
     }
 
-    resolveAssign(actual, lhsEltType, rhsEltType, rv);
+    processInit(frame, actual, lhsEltType, rhsEltType, rv);
   }
 }
 

frontend/test/resolution/testCallInitDeinit.cpp

@@ -2034,9 +2034,9 @@ static void test31() {
       {AssociatedAction::INIT_OTHER, "tup",         ""},
       {AssociatedAction::NEW_INIT,   "M.test@12",   ""},
       {AssociatedAction::ASSIGN,     "M.test@14",   ""},
-      {AssociatedAction::COPY_INIT,  "b",           ""},
-      {AssociatedAction::DEINIT,     "M.test@18",   "r"},
-      {AssociatedAction::DEINIT,     "M.test@18",   "b"}
+      {AssociatedAction::COPY_INIT,  "M.test@15",   ""},
+      {AssociatedAction::DEINIT,     "M.test@20",   "b"},
+      {AssociatedAction::DEINIT,     "M.test@20",   "r"}
     });
 }