Merge pull request #3616 from 9rnsr/fix12841

Issue 12841 - ICE on taking function address
dlang · Jun 3, 2014 · 1e7dda4 · 1e7dda4
2 parents 170c2b2 + f1b7537
commit 1e7dda4
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 6 deletions.
diff --git a/src/expression.c b/src/expression.c
@@ -9083,9 +9083,11 @@ Expression *AddrExp::semantic(Scope *sc)
                 return new ErrorExp;
             Dsymbol *s = ti->inst->toAlias();
             FuncDeclaration *f = s->isFuncDeclaration();
-            assert(f);
-            e1 = new DotVarExp(e1->loc, dti->e1, f);
-            e1 = e1->semantic(sc);
+            if (f)
+            {
+                e1 = new DotVarExp(e1->loc, dti->e1, f);
+                e1 = e1->semantic(sc);
+            }
         }
     }
     else if (e1->op == TOKimport)
@@ -9099,9 +9101,11 @@ Expression *AddrExp::semantic(Scope *sc)
                 return new ErrorExp;
             Dsymbol *s = ti->inst->toAlias();
             FuncDeclaration *f = s->isFuncDeclaration();
-            assert(f);
-            e1 = new VarExp(e1->loc, f);
-            e1 = e1->semantic(sc);
+            if (f)
+            {
+                e1 = new VarExp(e1->loc, f);
+                e1 = e1->semantic(sc);
+            }
         }
     }
     e1 = e1->toLvalue(sc, NULL);

diff --git a/test/fail_compilation/ice12841.d b/test/fail_compilation/ice12841.d
@@ -0,0 +1,25 @@
+/*
+TEST_OUTPUT:
+---
+fail_compilation/ice12841.d(23): Error: taskPool().amap!"a.result()" is not an lvalue
+fail_compilation/ice12841.d(24): Error: amap!"a.result()" is not an lvalue
+---
+*/
+
+@property TaskPool taskPool() @trusted { return new TaskPool; }
+
+final class TaskPool
+{
+    template amap(functions...)
+    {
+        auto amap(Args...)(Args args)
+        {
+        }
+    }
+}
+
+void main()
+{
+    auto dg = &(taskPool.amap!"a.result()");
+    auto fp = &(TaskPool.amap!"a.result()");
+}