From d6a73cc353b90dbb253985aa6aba95c0d98680e6 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Tue, 11 Dec 2018 11:07:24 +0000 Subject: [PATCH] ccmp.c (ccmp_candidate_p): Use GIMPLE API properly. 2018-12-11 Richard Biener * ccmp.c (ccmp_candidate_p): Use GIMPLE API properly. From-SVN: r266975 --- gcc/ChangeLog | 4 ++++ gcc/ccmp.c | 11 ++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 18a1a827ece..5c95b16f364 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2018-12-11 Richard Biener + + * ccmp.c (ccmp_candidate_p): Use GIMPLE API properly. + 2018-12-11 Jakub Jelinek PR lto/86004 diff --git a/gcc/ccmp.c b/gcc/ccmp.c index 233016fd711..4500609ef90 100644 --- a/gcc/ccmp.c +++ b/gcc/ccmp.c @@ -94,7 +94,6 @@ ccmp_tree_comparison_p (tree t, basic_block bb) static bool ccmp_candidate_p (gimple *g) { - tree rhs; tree lhs, op0, op1; gimple *gs0, *gs1; tree_code tcode; @@ -103,20 +102,18 @@ ccmp_candidate_p (gimple *g) if (!g) return false; - rhs = gimple_assign_rhs_to_tree (g); - tcode = TREE_CODE (rhs); + tcode = gimple_assign_rhs_code (g); if (tcode != BIT_AND_EXPR && tcode != BIT_IOR_EXPR) return false; lhs = gimple_assign_lhs (g); - op0 = TREE_OPERAND (rhs, 0); - op1 = TREE_OPERAND (rhs, 1); - bb = gimple_bb (g); - + op0 = gimple_assign_rhs1 (g); + op1 = gimple_assign_rhs2 (g); if ((TREE_CODE (op0) != SSA_NAME) || (TREE_CODE (op1) != SSA_NAME) || !has_single_use (lhs)) return false; + bb = gimple_bb (g); gs0 = get_gimple_for_ssa_name (op0); /* gs0 may be NULL */ gs1 = get_gimple_for_ssa_name (op1); /* gs1 may be NULL */ -- 2.30.2