Fix bugzilla 24731 - IFTI cannot handle integer expressions (dlang/dmd!16822)

Author: dkorpel

dmd/dtemplate.d

@@ -1698,7 +1698,9 @@ MATCH deduceType(RootObject o, Scope* sc, Type tparam, ref TemplateParameters pa
  edim = s ? getValue(s) : getValue(e);
  }
  }
- if (tp && tp.matchArg(sc, t.dim, i, &parameters, dedtypes, null) || edim && edim.toInteger() == t.dim.toInteger())
+ if ((tp && tp.matchArg(sc, t.dim, i, &parameters, dedtypes, null)) ||
+ (edim && edim.isIntegerExp() && edim.toInteger() == t.dim.toInteger())
+ )
  {
  result = deduceType(t.next, sc, tparam.nextOf(), parameters, dedtypes, wm);
  return;

dmd/expression.d

@@ -474,7 +474,7 @@ extern (C++) abstract class Expression : ASTNode
  dinteger_t toInteger()
  {
  //printf("Expression %s\n", EXPtoString(op).ptr);
- if (!type.isTypeError())
+ if (!type || !type.isTypeError())
  error(loc, "integer constant expression expected instead of `%s`", toChars());
  return 0;
  }

tests/dmd/runnable/ifti.d

@@ -72,6 +72,20 @@ class Tst(TST, int v = 2) {
 
 class Y : Tst!(float) {}
 
+// https://issues.dlang.org/show_bug.cgi?id=24731
+void test24731()
+{
+ static int solve(size_t N)(ref double[N+1][N])
+ {
+ return N;
+ }
+
+ double[3][2] m;
+ assert(solve(m) == 2);
+ assert(solve!2(m) == 2);
+}
+
+
 void main() {
  Tst!(int) t = new Tst!(int);
  Y u = new Y;
@@ -113,4 +127,5 @@ void main() {
  printf("%g\n", i);
  }
 
+ test24731();
 }