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

From-SVN: r87763

gcc/ChangeLog

+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 

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);