From cf4ef6f7d4342aff9c7cefeb4bdcffc714806de9 Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Wed, 20 May 2015 11:47:18 +0000 Subject: [PATCH] cfgexpand.c (expand_debug_expr): Use UNARY_CLASS_P. * cfgexpand.c (expand_debug_expr): Use UNARY_CLASS_P. * c-omp.c (check_omp_for_incr_expr): Use BINARY_CLASS_P. From-SVN: r223442 --- gcc/ChangeLog | 4 ++++ gcc/c-family/ChangeLog | 4 ++++ gcc/c-family/c-omp.c | 2 +- gcc/cfgexpand.c | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 701b7590c41..ba1186db344 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2015-05-20 Marek Polacek + + * cfgexpand.c (expand_debug_expr): Use UNARY_CLASS_P. + 2015-05-20 Marek Polacek * expr.c (expand_cond_expr_using_cmove): Use COMPARISON_CLASS_P. diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index 30e61562729..9d7736ecc5f 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,7 @@ +2015-05-20 Marek Polacek + + * c-omp.c (check_omp_for_incr_expr): Use BINARY_CLASS_P. + 2015-05-20 Marek Polacek * c-ada-spec.c (dump_sloc): Use DECL_P. diff --git a/gcc/c-family/c-omp.c b/gcc/c-family/c-omp.c index 86a9f54b806..168cae985d9 100644 --- a/gcc/c-family/c-omp.c +++ b/gcc/c-family/c-omp.c @@ -395,7 +395,7 @@ check_omp_for_incr_expr (location_t loc, tree exp, tree decl) { tree op1 = TREE_OPERAND (exp, 1); tree temp = TARGET_EXPR_SLOT (op0); - if (TREE_CODE_CLASS (TREE_CODE (op1)) == tcc_binary + if (BINARY_CLASS_P (op1) && TREE_OPERAND (op1, 1) == temp) { op1 = copy_node (op1); diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c index 09e668acb7c..f65e1fc7009 100644 --- a/gcc/cfgexpand.c +++ b/gcc/cfgexpand.c @@ -4039,7 +4039,7 @@ expand_debug_expr (tree exp) op0 = simplify_gen_subreg (mode, op0, inner_mode, subreg_lowpart_offset (mode, inner_mode)); - else if (TREE_CODE_CLASS (TREE_CODE (exp)) == tcc_unary + else if (UNARY_CLASS_P (exp) ? TYPE_UNSIGNED (TREE_TYPE (TREE_OPERAND (exp, 0))) : unsignedp) op0 = simplify_gen_unary (ZERO_EXTEND, mode, op0, inner_mode); -- 2.30.2