Remove last comparison-code expand_vec_cond_expr_p call from vectorizer

The following refactors the check with the last remaininig
expand_vec_cond_expr_p call with a comparison code to make it
obvious we are not relying on those anymore.

	* tree-vect-stmts.cc (vectorizable_condition): Refactor
	target support check.

diff --git a/gcc/tree-vect-stmts.cc b/gcc/tree-vect-stmts.cc
index 5d731205675eaeb8732b260d81d4ea546512b398..a83a46ea0dd9104a0a37adcaf519bbea71b18ec8 100644 (file)
--- a/gcc/tree-vect-stmts.cc
+++ b/gcc/tree-vect-stmts.cc
@@ -12460,9 +12460,9 @@ vectorizable_condition (vec_info *vinfo,
       if (reduction_type == EXTRACT_LAST_REDUCTION)
        /* Count one reduction-like operation per vector.  */
        kind = vec_to_scalar;
-      else if (!expand_vec_cond_expr_p (vectype, comp_vectype, cond_code)
-              && (masked
-                  || (!expand_vec_cmp_expr_p (comp_vectype, vec_cmp_type,
+      else if ((masked && !expand_vec_cond_expr_p (vectype, comp_vectype))
+              || (!masked
+                  && (!expand_vec_cmp_expr_p (comp_vectype, vec_cmp_type,
                                               cond_code)
                       || !expand_vec_cond_expr_p (vectype, vec_cmp_type))))
        return false;