Refactor to include manageability check

Signed-off-by: Anna Rift <anna.rift@hpe.com>
chapel-lang · Sep 11, 2024 · 5d9f013 · 5d9f013
1 parent 8176e35
commit 5d9f013
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/frontend/lib/resolution/resolution-queries.cpp b/frontend/lib/resolution/resolution-queries.cpp
@@ -1632,15 +1632,13 @@ QualifiedType getInstantiationType(Context* context,
 
       // which BasicClassType to use?
       const BasicClassType* bct;
-      if (auto formalBct = formalCt->basicClassType()) {
+      auto formalBct = formalCt->basicClassType();
+      if (formalBct && getTypeGenericity(context, bct) == Type::CONCRETE) {
         bct = formalBct;
       } else {
         CHPL_ASSERT(formalCt->manageableType()->toManageableType());
         bct = actualCt->basicClassType();
       }
-      if (getTypeGenericity(context, bct) != Type::CONCRETE) {
-        bct = actualCt->basicClassType();
-      }
 
       // now construct the ClassType
       auto ct = ClassType::get(context, bct, manager, dec);