[gcc(refs/vendors/ARM/heads/arm-struct-reorg-wip)] tree-optimization/95487 - use a truth type for scatter masks

[Tamar Christina]

https://gcc.gnu.org/g:2eed94cbf2e8182d700aac3ac52b0967f00a2621

commit 2eed94cbf2e8182d700aac3ac52b0967f00a2621
Author: Richard Biener <rguenther@suse.de>
Date:   Wed Jun 3 15:51:29 2020 +0200

    tree-optimization/95487 - use a truth type for scatter masks
    
    This makes sure to get a truth type for scatter masks even when they
    are invariant.
    
    2020-06-03  Richard Biener  <rguenther@suse.de>
    
            PR tree-optimization/95487
            * tree-vect-stmts.c (vectorizable_store): Use a truth type
            for the scatter mask.
    
            * g++.dg/vect/pr95487.cc: New testcase.

Diff:
---
 gcc/testsuite/g++.dg/vect/pr95487.cc | 20 ++++++++++++++++++++
 gcc/tree-vect-stmts.c                |  8 ++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/gcc/testsuite/g++.dg/vect/pr95487.cc b/gcc/testsuite/g++.dg/vect/pr95487.cc
new file mode 100644
index 00000000000..34023d25572
--- /dev/null
+++ b/gcc/testsuite/g++.dg/vect/pr95487.cc
@@ -0,0 +1,20 @@
+// { dg-do compile }
+// { dg-additional-options "-O3" }
+// { dg-additional-options "-march=skylake-avx512" { target x86_64-*-* i?86-*-* } }
+
+int a;
+bool d;
+char e;
+extern short f[];
+extern int g[];
+short j;
+void h() {
+  for (short b = j; b < 0; b += 2) {
+    f[b] = 0;
+    if (d) {
+      for (char c = 0; c < a; c += 3)
+        e = 0;
+      g[b] = 0;
+    }
+  }
+}
diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index 1984787bac4..9ace345fc5e 100644
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -7643,8 +7643,12 @@ vectorizable_store (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
 	      op = vec_oprnd0 = vect_get_vec_def_for_operand (gs_info.offset,
 							      stmt_info);
 	      if (mask)
-		mask_op = vec_mask = vect_get_vec_def_for_operand (mask,
-								   stmt_info);
+		{
+		  tree mask_vectype = truth_type_for (vectype);
+		  mask_op = vec_mask
+		    = vect_get_vec_def_for_operand (mask,
+						    stmt_info, mask_vectype);
+		}
 	    }
 	  else if (modifier != NONE && (j & 1))
 	    {