Merge pull request #241 from ibuclaw/bug213

Bug 213: Fix ICE when comparing two SIMD vectors in a struct
D-Programming-GDC · Sep 17, 2016 · 26d36a5 · 26d36a5
2 parents 33b8889 + 6542f6e
commit 26d36a5
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/gcc/d/ChangeLog b/gcc/d/ChangeLog
@@ -1,3 +1,8 @@
+2016-09-16  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+	* d-codegen.cc (lower_struct_comparison): Don't compare vectors in the
+	same way as integers.
+
 2016-09-11  Iain Buclaw  <ibuclaw@gdcproject.org>
 
 	* d-todt.cc (Type::toDt): Remove function, inline into callers.

diff --git a/gcc/d/d-codegen.cc b/gcc/d/d-codegen.cc
@@ -1945,7 +1945,7 @@ lower_struct_comparison(tree_code code, StructDeclaration *sd, tree t1, tree t2)
 	  tree stype = build_ctype(vd->type);
 	  machine_mode mode = int_mode_for_mode(TYPE_MODE (stype));
 
-	  if (vd->type->isintegral())
+	  if (vd->type->ty != Tvector && vd->type->isintegral())
 	    {
 	      // Integer comparison, no special handling required.
 	      tcmp = build_boolop(code, t1ref, t2ref);

diff --git a/gcc/testsuite/gdc.test/compilable/gdc213.d b/gcc/testsuite/gdc.test/compilable/gdc213.d
@@ -0,0 +1,13 @@
+import core.simd;
+
+struct S213
+{
+    int4 vec;
+}
+
+void test213()
+{
+    S213 s, b;
+
+    assert(s == b);
+}
diff --git a/gcc/testsuite/gdc.test/compilable/gdc.d → gcc/testsuite/gdc.test/compilable/gdc223.d b/gcc/testsuite/gdc.test/compilable/gdc.d → gcc/testsuite/gdc.test/compilable/gdc223.d