Switch tuple expression kind back to CONST_VAR

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

Author: arifthpe

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

@@ -187,6 +187,14 @@ static bool isTypeParam(QualifiedType::Kind kind) {
 bool CallInitDeinit::isCallProducingValue(const AstNode* rhsAst,
                                           const QualifiedType& rhsType,
                                           RV& rv) {
+  if (rhsAst->isTuple() && rhsType.type() && rhsType.type()->isTupleType()) {
+    if (auto asTupleType = rhsType.type()->toTupleType()) {
+      // Consider a tuple expression to be a call producing a value (for the
+      // purposes of call-init-deinit) iff it contains only value elements.
+      return asTupleType == asTupleType->toValueTuple(context);
+    }
+  }
+
   return rv.byAst(rhsAst).toId().isEmpty() && !isRef(rhsType.kind());
 }
 

frontend/lib/resolution/resolution-queries.cpp

@@ -5811,12 +5811,8 @@ CallResolutionResult resolveTupleExpr(Context* context,
     kind = QualifiedType::TYPE;
     t = TupleType::getValueTuple(context, std::move(eltTypes));
   } else if (allValue) {
-    kind = QualifiedType::CONST_REF;
+    kind = QualifiedType::CONST_VAR;
     t = TupleType::getReferentialTuple(context, std::move(eltTypes));
-    // Use CONST_VAR intent for tuple expressions containing no references
-    if (t->toTupleType()->toValueTuple(context) == t->toTupleType()) {
-      kind = QualifiedType::CONST_VAR;
-    }
   } else {
     context->error(tuple, "Mix of value and type tuple elements in tuple expr");
     kind = QualifiedType::UNKNOWN;

frontend/test/resolution/testTuples.cpp

@@ -87,7 +87,7 @@ static void test3() {
                   var x = (r, r);
                 )"""");
 
-  assert(qt.kind() == QualifiedType::CONST_REF);
+  assert(qt.kind() == QualifiedType::CONST_VAR);
   assert(qt.type()->isTupleType());
   auto tt = qt.type()->toTupleType();
   assert(tt->numElements() == 2);