* predict.c (expr_expected_value): Use *_CLASS_P macros.

From-SVN: r87763

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 69fd9328f3967b1d0194a7d62d79e2ececb23729..ec5ed7993aa66881bb01756a45596ef1f3f8f0af 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-20  Jakub Jelinek  <jakub@redhat.com>
+
+       * predict.c (expr_expected_value): Use *_CLASS_P macros.
+
 2004-09-20  Daniel Berlin  <dberlin@dberlin.org>
 
        * tree-ssa-pre.c (compute_antic_aux): Use malloc'd worklist, to avoid 

diff --git a/gcc/predict.c b/gcc/predict.c
index d344907717779db07a71c519355dcc4388754297..c0e7df2a97254f1a754cdd23da489353b9fe6dd9 100644 (file)
--- a/gcc/predict.c
+++ b/gcc/predict.c
@@ -944,8 +944,7 @@ expr_expected_value (tree expr, bitmap visited)
          return TREE_VALUE (TREE_CHAIN (TREE_OPERAND (expr, 1)));
        }
     }
-  if (TREE_CODE_CLASS (TREE_CODE (expr)) == '2'
-      || TREE_CODE_CLASS (TREE_CODE (expr)) == '<')
+  if (BINARY_CLASS_P (expr) || COMPARISON_CLASS_P (expr))
     {
       tree op0, op1, res;
       op0 = expr_expected_value (TREE_OPERAND (expr, 0), visited);
@@ -959,7 +958,7 @@ expr_expected_value (tree expr, bitmap visited)
        return res;
       return NULL;
     }
-  if (TREE_CODE_CLASS (TREE_CODE (expr)) == '1')
+  if (UNARY_CLASS_P (expr))
     {
       tree op0, res;
       op0 = expr_expected_value (TREE_OPERAND (expr, 0), visited);