Merge pull request #10195 from Basile-z/stable

fix issue 19950 - access violation at compile time, possibly via template constraint and alias interaction merged-on-behalf-of: Nicholas Wilson <thewilsonator@users.noreply.github.com>
dlang · Jul 19, 2019 · f8f8a6c · f8f8a6c
2 parents 9f3c29a + 9cd97ab
commit f8f8a6c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/src/dmd/dtemplate.d b/src/dmd/dtemplate.d
@@ -962,12 +962,9 @@ extern (C++) final class TemplateDeclaration : ScopeDsymbol
                 tf.fargs = fargs;
                 uint olderrors = global.startGagging();
                 fd.type = tf.typeSemantic(loc, paramscope);
-                if (global.endGagging(olderrors))
-                {
-                    assert(fd.type.ty != Tfunction);
+                global.endGagging(olderrors);
+                if (fd.type.ty != Tfunction)
                     goto Lnomatch;
-                }
-                assert(fd.type.ty == Tfunction);
                 fd.originalType = fd.type; // for mangling
             }
 

diff --git a/test/fail_compilation/ice19950.d b/test/fail_compilation/ice19950.d
@@ -0,0 +1,13 @@
+/*
+TEST_OUTPUT:
+---
+fail_compilation/ice19950.d(8): Error: undefined identifier `NotHere`
+fail_compilation/ice19950.d(9): Error: template instance `ice19950.baz!()` does not match template declaration `baz()(Foo) if (true)`
+---
+*/
+alias Foo = NotHere;
+alias Bar = baz!();
+
+void baz()(Foo)
+    if (true)
+{}