Only keep eltType in generic-domain arr if resolved

Signed-off-by: Anna Rift <[email protected]>
chapel-lang · Feb 5, 2025 · bfc24ed · bfc24ed
1 parent 2c98242
commit bfc24ed
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/frontend/lib/resolution/Resolver.cpp b/frontend/lib/resolution/Resolver.cpp
@@ -6275,14 +6275,17 @@ static bool handleArrayTypeExpr(Resolver& rv,
   // Assemble the array type
   auto arrayType = genericArrayType;
   if (domainType.type() == DomainType::getGenericDomainType(rv.context)) {
-    auto domainTypeAsType =
-        QualifiedType(QualifiedType::TYPE, domainType.type());
-    arrayType =
-        QualifiedType(QualifiedType::TYPE,
-                      ArrayType::getArrayType(rv.context,
-                                              /* instance */ QualifiedType(),
-                                              /* domainType */ domainTypeAsType,
-                                              /* eltType */ eltType));
+    // Preserve eltType info, if we have it.
+    if (!eltType.isUnknownOrErroneous()) {
+      auto domainTypeAsType =
+          QualifiedType(QualifiedType::TYPE, domainType.type());
+      arrayType = QualifiedType(
+          QualifiedType::TYPE,
+          ArrayType::getArrayType(rv.context,
+                                  /* instance */ QualifiedType(),
+                                  /* domainType */ domainTypeAsType,
+                                  /* eltType */ eltType));
+    }
   } else {
     // We have an instantiated domain, so get array type via call to its
     // array builder function.