Bug 133 - ICE: Appending a delegate to an array

D-Programming-GDC · Jun 14, 2014 · 6090d4b · 6090d4b
1 parent ccfb889
commit 6090d4b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/gcc/d/ChangeLog b/gcc/d/ChangeLog
@@ -1,5 +1,7 @@
 2014-06-14  Iain Buclaw  <ibuclaw@gdcproject.org>
 
+	* d-codegen.h(d_types_compatible): First check equality of types, then
+	implicit compatibility.
 	* d-convert.cc(d_default_conversion): Remove function, fold
 	implementation into...
 	(d_truthvalue_conversion): ... here.

diff --git a/gcc/d/d-codegen.h b/gcc/d/d-codegen.h
@@ -236,7 +236,8 @@ d_types_same (Type *t1, Type *t2)
 inline bool
 d_types_compatible (Type *t1, Type *t2)
 {
-  return t1->implicitConvTo (t2) >= MATCHconst;
+  return t1->equals(t2)
+    || t1->implicitConvTo (t2) >= MATCHconst;
 }
 
 // Returns D Frontend type for GCC type T.

diff --git a/gcc/testsuite/gdc.test/runnable/gdc.d b/gcc/testsuite/gdc.test/runnable/gdc.d
@@ -632,6 +632,18 @@ int[0] test127a;     // OK
 int[1][0] test127b;  // OK
 int[0][1] test127c;  // ICE
 
+/******************************************/
+
+// Bug 133
+
+void delegate()[] D133;
+
+void test133(void delegate() dg)
+{
+    D133 ~= dg;
+}
+
+
 /******************************************/
 
 void main()