* cfgexpand.c (expand_debug_expr): Use UNARY_CLASS_P.

	* c-omp.c (check_omp_for_incr_expr): Use BINARY_CLASS_P.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223442 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 701b759..ba1186d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2015-05-20  Marek Polacek  <polacek@redhat.com>
 
+       * cfgexpand.c (expand_debug_expr): Use UNARY_CLASS_P.
+
+2015-05-20  Marek Polacek  <polacek@redhat.com>
+
        * expr.c (expand_cond_expr_using_cmove): Use COMPARISON_CLASS_P.
        * gimple-expr.c (gimple_cond_get_ops_from_tree): Likewise.
        * gimple-fold.c (canonicalize_bool): Likewise.

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 30e6156..9d7736e 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,5 +1,9 @@
 2015-05-20  Marek Polacek  <polacek@redhat.com>
 
+       * c-omp.c (check_omp_for_incr_expr): Use BINARY_CLASS_P.
+
+2015-05-20  Marek Polacek  <polacek@redhat.com>
+
        * c-ada-spec.c (dump_sloc): Use DECL_P.
 
 2015-05-20  Marek Polacek  <polacek@redhat.com>

diff --git a/gcc/c-family/c-omp.c b/gcc/c-family/c-omp.c
index 86a9f54..168cae9 100644 (file)
--- 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 09e668a..f65e1fc 100644 (file)
--- 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);