diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c26c00824d1..4e8e1e8233a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -4,6 +4,8 @@
 	(fold_rtx): Call fold_rtx_subreg and fold_rtx_mem to handle
 	SUBREG and MEM, respectively.
 
+	* fold-const.c (fold_binary): Use code instead of t.
+
 2005-03-06  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* fold-const.c (fold_binary): Avoid directly using the original
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 2577da2690e..c6105dc8fa2 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -8727,7 +8727,7 @@ fold_binary (tree expr)
       /* If this is a comparison of two exprs that look like an
 	 ARRAY_REF of the same object, then we can fold this to a
 	 comparison of the two offsets.  */
-      if (COMPARISON_CLASS_P (t))
+      if (TREE_CODE_CLASS (code) == tcc_comparison)
 	{
 	  tree base0, offset0, base1, offset1;