Also account for genericity via grandparent

Signed-off-by: Anna Rift <[email protected]>
tzinsky · Sep 3, 2024 · a5a8aab · a5a8aab
1 parent 67dda3e
commit a5a8aab
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/frontend/lib/resolution/InitResolver.cpp b/frontend/lib/resolution/InitResolver.cpp
@@ -279,7 +279,8 @@ static const Type* ctFromSubs(Context* context,
     auto oldBasic = cls->basicClassType();
     CHPL_ASSERT(oldBasic && "Not handled!");
 
-    bool genericParent = superType && superType->substitutions().size() != 0;
+    bool genericParent =
+        superType && superType->instantiatedFromCompositeType() != nullptr;
     auto instantiatedFrom = (subs.size() == 0 && !genericParent)
                                   ? nullptr
                                   : root->toBasicClassType();
@@ -311,7 +312,8 @@ const Type* InitResolver::computeReceiverTypeConsideringState(void) {
                                        DefaultsPolicy::USE_DEFAULTS);
   CompositeType::SubstitutionsMap subs;
 
-  bool genericParent = superType_ && superType_->substitutions().size() != 0;
+  bool genericParent =
+      superType_ && superType_->instantiatedFromCompositeType() != nullptr;
 
   if (!rfNoDefaults.isGeneric()) {
     if (genericParent) {