fix Issue 11944 - ICE(expression.c) Assertion `f' failed.

dlang · Jan 20, 2014 · 5d1237d · 5d1237d
1 parent 2401bf3
commit 5d1237d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/expression.c b/src/expression.c
@@ -9307,7 +9307,7 @@ Expression *AddrExp::semantic(Scope *sc)
             {
                 //assert(ti->needsTypeInference(sc));
                 ti->semantic(sc);
-                if (!ti->inst)                  // if template failed to expand
+                if (!ti->inst || ti->errors)    // if template failed to expand
                     return new ErrorExp;
                 Dsymbol *s = ti->inst->toAlias();
                 FuncDeclaration *f = s->isFuncDeclaration();
@@ -9323,7 +9323,7 @@ Expression *AddrExp::semantic(Scope *sc)
             {
                 //assert(ti->needsTypeInference(sc));
                 ti->semantic(sc);
-                if (!ti->inst)                  // if template failed to expand
+                if (!ti->inst || ti->errors)    // if template failed to expand
                     return new ErrorExp;
                 Dsymbol *s = ti->inst->toAlias();
                 FuncDeclaration *f = s->isFuncDeclaration();

diff --git a/test/fail_compilation/ice11944.d b/test/fail_compilation/ice11944.d
@@ -0,0 +1,12 @@
+/*
+TEST_OUTPUT:
+---
+fail_compilation/ice11944.d(12): Error: template instance doCommand!(func) does not match template declaration doCommand(f, T)(f, T arg)
+---
+*/
+
+void func(int var) {}
+
+void doCommand(f, T)(f, T arg) {}
+
+auto var = &doCommand!func;