dmd.dtemplate: Recurse through the primary instantiation, skip if 'in…

…st' was set to null
dlang · Jan 10, 2023 · 6739d65 · 6739d65
1 parent 39bd972
commit 6739d65
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/compiler/src/dmd/dtemplate.d b/compiler/src/dmd/dtemplate.d
@@ -6263,7 +6263,7 @@ extern (C++) class TemplateInstance : ScopeDsymbol
 
         // When no errors instantiating, this should only be called on
         // the primary instantiation.
-        assert(this is inst || inst is null);
+        assert(this is inst);
 
         if (global.params.allInst)
         {
@@ -6275,11 +6275,9 @@ extern (C++) class TemplateInstance : ScopeDsymbol
                     return ThreeState.yes;
 
                 // Do codegen if the ancestor needs it.
-                if (tinst && tinst.inst && tinst !is tinst.inst)
-                    tinst = tinst.inst;
-                if (tinst && tinst.needsCodegen())
+                if (tinst && tinst.inst && tinst.inst.needsCodegen())
                 {
-                    tithis.minst = tinst.minst; // cache result
+                    tithis.minst = tinst.inst.minst; // cache result
                     assert(tithis.minst);
                     assert(tithis.minst.isRoot());
                     return ThreeState.yes;
@@ -6337,10 +6335,9 @@ extern (C++) class TemplateInstance : ScopeDsymbol
                 // If the ancestor isn't speculative,
                 // 1. do codegen if the ancestor needs it
                 // 2. elide codegen if the ancestor doesn't need it (non-root instantiation of ancestor incl. subtree)
-                if (tinst)
+                if (tinst && tinst.inst) // and not a dummy instance (see evaluateConstraint)
                 {
-                    if (tinst.inst && tinst !is tinst.inst)
-                        tinst = tinst.inst;
+                    tinst = tinst.inst;
                     const needsCodegen = tinst.needsCodegen(); // sets tinst.minst
                     if (tinst.minst) // not speculative
                     {