semantic3: Fix more assertions if TypeInfo_AssociativeArray is misdefined

Author: ibuclaw

compiler/src/dmd/semantic3.d

@@ -1631,6 +1631,11 @@ private extern(C++) final class Semantic3Visitor : Visitor
             return new DotTemplateInstanceExp(loc, id, hook, tiargs);
         }
 
+        void notTemplateFunction(Loc loc, Identifier id)
+        {
+            error(loc, "`%s` isn't a template function", id.toChars());
+        }
+
         // generate ti.entry
         auto tempinst = makeDotExp(Id.Entry);
         auto e = expressionSemantic(tempinst, sc2);
@@ -1645,25 +1650,35 @@ private extern(C++) final class Semantic3Visitor : Visitor
         semanticTypeInfo(sc2, ti.entry); // might get deferred
 
         // generate ti.xtoHash
-        auto hashinst = makeDotExp(Identifier.idPool("aaGetHash"));
+        auto aaGetHash = Identifier.idPool("aaGetHash");
+        auto hashinst = makeDotExp(aaGetHash);
         e = expressionSemantic(hashinst, sc2);
         if (!e.isErrorExp())
         {
-            assert(e.isVarExp() && e.type.isTypeFunction());
-            ti.xtoHash = e.isVarExp().var;
-            if (auto tmpl = ti.xtoHash.parent.isTemplateInstance())
-                tmpl.minst = sc2._module.importedFrom; // ensure it gets emitted
+            if (!e.isVarExp() || !e.type.isTypeFunction())
+                notTemplateFunction(e.loc, aaGetHash);
+            else
+            {
+                ti.xtoHash = e.isVarExp().var;
+                if (auto tmpl = ti.xtoHash.parent.isTemplateInstance())
+                    tmpl.minst = sc2._module.importedFrom; // ensure it gets emitted
+            }
         }
 
         // generate ti.xopEqual
-        auto equalinst = makeDotExp(Identifier.idPool("aaOpEqual"));
+        auto aaOpEqual = Identifier.idPool("aaOpEqual");
+        auto equalinst = makeDotExp(aaOpEqual);
         e = expressionSemantic(equalinst, sc2);
         if (!e.isErrorExp())
         {
-            assert(e.isVarExp() && e.type.isTypeFunction());
-            ti.xopEqual = e.isVarExp().var;
-            if (auto tmpl = ti.xopEqual.parent.isTemplateInstance())
-                tmpl.minst = sc2._module.importedFrom; // ensure it gets emitted
+            if (!e.isVarExp() || !e.type.isTypeFunction())
+                notTemplateFunction(e.loc, aaOpEqual);
+            else
+            {
+                ti.xopEqual = e.isVarExp().var;
+                if (auto tmpl = ti.xopEqual.parent.isTemplateInstance())
+                    tmpl.minst = sc2._module.importedFrom; // ensure it gets emitted
+            }
         }
         visit(cast(ASTCodegen.TypeInfoDeclaration)ti);
     }

compiler/test/fail_compilation/test20863.d

@@ -0,0 +1,23 @@
+// must not assert/crash with empty declarations
+/* TEST_OUTPUT:
+---
+fail_compilation/test20863a.d(21): Error: no property `Entry` for type `object.TypeInfo_AssociativeArray`
+fail_compilation/test20863a.d(17):        class `TypeInfo_AssociativeArray` defined here
+fail_compilation/test20863a.d(21): Error: no property `aaGetHash` for type `object.TypeInfo_AssociativeArray`
+fail_compilation/test20863a.d(17):        class `TypeInfo_AssociativeArray` defined here
+fail_compilation/test20863a.d(21): Error: no property `aaOpEqual` for type `object.TypeInfo_AssociativeArray`
+fail_compilation/test20863a.d(17):        class `TypeInfo_AssociativeArray` defined here
+---
+*/
+
+module object;
+
+class Object { }
+class TypeInfo { }
+class TypeInfo_AssociativeArray { }
+
+extern(C) int main()
+{
+    int[int] aa;
+    return 0;
+}

compiler/test/fail_compilation/test20863a.d

@@ -0,0 +1,25 @@
+// must not assert/crash with mismatched declarations
+/* TEST_OUTPUT:
+---
+fail_compilation/test20863b.d(23): Error: `Entry` isn't a template
+fail_compilation/test20863b.d(23): Error: `aaGetHash` isn't a template function
+fail_compilation/test20863b.d(23): Error: `aaOpEqual` isn't a template function
+---
+*/
+
+module object;
+
+class Object { }
+class TypeInfo { }
+class TypeInfo_AssociativeArray
+{
+    int Entry;
+    struct aaOpEqual(K, V) { }
+    struct aaGetHash(K, V) { }
+}
+
+extern(C) int main()
+{
+    int[int] aa;
+    return 0;
+}