Skip _ var decls in VarScopeVisitor

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

Author: arifthpe

frontend/lib/resolution/VarScopeVisitor.cpp

@@ -454,19 +454,18 @@ void VarScopeVisitor::exit(const NamedDecl* ast, RV& rv) {
   //       is there an analysis that does need to handle loop indices?
   if (!isLoopIndex(ast)) {
     if (auto vld = ast->toVarLikeDecl()) {
-      const AstNode* astForDeclProps;
-
       const AstNode* parent;
       const AstNode* initExpr;
       QualifiedType initType;
       Qualifier intentOrKind;
       bool isFormal;
 
       auto maybeOuterTuple = outermostContainingTuple();
-      if (const TupleDecl* outerTuple =
+      if (vld->name() == USTR("_") && maybeOuterTuple) {
+        // Skip _ ident in tuple
+      } else if (const TupleDecl* outerTuple =
               (maybeOuterTuple ? maybeOuterTuple->toTupleDecl() : nullptr)) {
-        astForDeclProps = outerTuple;
-
+        parent = parsing::parentAst(context, outerTuple);
         initExpr = outerTuple->initExpression();
         auto parentInitExpr = tupleInitExprsStack.back();
         if (parentInitExpr) {
@@ -480,19 +479,20 @@ void VarScopeVisitor::exit(const NamedDecl* ast, RV& rv) {
               parentInitTupleType->elementType(indexWithinContainingTuple(ast));
         }
         intentOrKind = (Qualifier)outerTuple->intentOrKind();
-      } else {
-        astForDeclProps = vld;
+        isFormal = outerTuple->isFormal() || outerTuple->isVarArgFormal() || outerTuple->isTupleDeclFormal();
 
+        handleDeclaration(vld, parent, initExpr, initType, intentOrKind, isFormal,
+                        rv);
+      } else {
+        parent = parsing::parentAst(context, vld);
         initExpr = vld->initExpression();
         initType = initExpr ? rv.byAst(initExpr).type() : QualifiedType();
         intentOrKind = vld->storageKind();
-      }
-      parent = parsing::parentAst(context, astForDeclProps);
-      isFormal =
-          astForDeclProps->isFormal() || astForDeclProps->isVarArgFormal();
+        isFormal = vld->isFormal() || vld->isVarArgFormal();
 
-      handleDeclaration(vld, parent, initExpr, initType, intentOrKind, isFormal,
+        handleDeclaration(vld, parent, initExpr, initType, intentOrKind, isFormal,
                         rv);
+      }
     }
   }
 

frontend/lib/resolution/copy-elision.cpp

@@ -387,8 +387,6 @@ void FindElidedCopies::handleDeclaration(const VarLikeDecl* ast,
     //   for (int i = 0; i < tupleExprInit->numActuals(); i++) {
     //     auto actual = tupleExprInit->actual(i);
     //     if (actual->isTuple()) {
-    //       // processSingleDeclHelper(ast, actual, QualifiedType(),
-    //       //                         isFormal, intentOrKind, rv);
     //       handleDeclaration(ast, parent, actual, QualifiedType(), intentOrKind,
     //                         isFormal, rv);
     //     } else {
@@ -398,7 +396,6 @@ void FindElidedCopies::handleDeclaration(const VarLikeDecl* ast,
     //         if (rv.hasId(lhsVarId) && rv.hasId(rhsVarId)) {
     //           if (lhsType.type() && lhsType.type()->isTupleType()) {
     //             const TupleType* ttype = lhsType.type()->toTupleType();
-    //             CHPL_ASSERT(ttype->numElements() == tupleExprInit->numActuals());
     //             QualifiedType lhsEltType = ttype->elementType(i);
 
     //             QualifiedType rhsType = rv.byId(rhsVarId).type();