ccmp.c (ccmp_tree_comparison_p): New function.

2017-06-29  Steve Ellcey  <sellcey@cavium.com>

	* ccmp.c (ccmp_tree_comparison_p): New function.
	(ccmp_candidate_p): Update to use above function.
	(get_compare_parts): New function.
	(expand_ccmp_next): Update to use new functions.
	(expand_ccmp_expr_1): Take tree arg instead of gimple, update to use
	new functions.
	(expand_ccmp_expr): Pass tree instead of gimple to expand_ccmp_expr_1,
	take mode as argument.
	* ccmp.h (expand_ccmp_expr): Add mode as argument.
	* expr.c (expand_expr_real_1): Pass mode as argument.

From-SVN: r249805

gcc/ChangeLog

+2017-06-29  Steve Ellcey  <sellcey@cavium.com>
+
+	* ccmp.c (ccmp_tree_comparison_p): New function.
+	(ccmp_candidate_p): Update to use above function.
+	(get_compare_parts): New function.
+	(expand_ccmp_next): Update to use new functions.
+	(expand_ccmp_expr_1): Take tree arg instead of gimple, update to use
+	new functions.
+	(expand_ccmp_expr): Pass tree instead of gimple to expand_ccmp_expr_1,
+	take mode as argument.
+	* ccmp.h (expand_ccmp_expr): Add mode as argument.
+	* expr.c (expand_expr_real_1): Pass mode as argument.
+
 2017-06-29  Segher Boessenkool  <segher@kernel.crashing.org>
 
 	* combine.c (combine_instructions): Print insns to dump_file, together

gcc/ccmp.h

@@ -20,6 +20,6 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef GCC_CCMP_H
 #define GCC_CCMP_H
 
-extern rtx expand_ccmp_expr (gimple *);
+extern rtx expand_ccmp_expr (gimple *, machine_mode);
 
 #endif  /* GCC_CCMP_H  */

gcc/expr.c

@@ -9776,7 +9776,7 @@ expand_expr_real_1 (tree exp, rtx target, machine_mode tmode,
 	      if (targetm.gen_ccmp_first)
 		{
 		  gcc_checking_assert (targetm.gen_ccmp_next != NULL);
-		  r = expand_ccmp_expr (g);
+		  r = expand_ccmp_expr (g, mode);
 		  if (r)
 		    break;
 		}