diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 552e97debce006dc9f05483899a7317a9efb39eb..72721e35f7349d2701f67e635e346ddc2dd4db1a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-30  Paolo Bonzini  <bonzini@gnu.org>
+
+        * combine.c (simplify_comparison): Use have_insn_for.
+        * dojump.c (do_jump): Likewise.
+
 2009-03-30  Paolo Bonzini  <bonzini@gnu.org>
 
 	* config/sparc/sparc.c (sparc_compare_emitted): Remove.
diff --git a/gcc/combine.c b/gcc/combine.c
index a8200bc125ad0c8427688279e8a111b55e7c1079..3ce8a75ca2f7044dec64648b78ca64182b84fcec 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -10534,7 +10534,7 @@ simplify_comparison (enum rtx_code code, rtx *pop0, rtx *pop1)
 	      && ((unsigned HOST_WIDE_INT) const_op
 		  < (((unsigned HOST_WIDE_INT) 1
 		      << (GET_MODE_BITSIZE (mode) - 1))))
-	      && optab_handler (cmp_optab, mode)->insn_code != CODE_FOR_nothing)
+	      && have_insn_for (COMPARE, mode))
 	    {
 	      op0 = XEXP (op0, 0);
 	      continue;
@@ -10615,7 +10615,7 @@ simplify_comparison (enum rtx_code code, rtx *pop0, rtx *pop1)
 	      && (unsigned_comparison_p || equality_comparison_p)
 	      && (GET_MODE_BITSIZE (mode) <= HOST_BITS_PER_WIDE_INT)
 	      && ((unsigned HOST_WIDE_INT) const_op < GET_MODE_MASK (mode))
-	      && optab_handler (cmp_optab, mode)->insn_code != CODE_FOR_nothing)
+	      && have_insn_for (COMPARE, mode))
 	    {
 	      op0 = XEXP (op0, 0);
 	      continue;
diff --git a/gcc/dojump.c b/gcc/dojump.c
index 060eb51e77e11677703556de3f6a13f897002d91..715e7373eeefc07ab767ae9e2a0915ed77de5238 100644
--- a/gcc/dojump.c
+++ b/gcc/dojump.c
@@ -257,8 +257,7 @@ do_jump (tree exp, rtx if_false_label, rtx if_true_label)
         if (! SLOW_BYTE_ACCESS
             && type != 0 && bitsize >= 0
             && TYPE_PRECISION (type) < TYPE_PRECISION (TREE_TYPE (exp))
-            && (optab_handler (cmp_optab, TYPE_MODE (type))->insn_code
-		!= CODE_FOR_nothing))
+            && have_insn_for (COMPARE, TYPE_MODE (type)))
           {
             do_jump (fold_convert (type, exp), if_false_label, if_true_label);
             break;
@@ -499,8 +498,7 @@ do_jump (tree exp, rtx if_false_label, rtx if_true_label)
           && (mode = mode_for_size (i + 1, MODE_INT, 0)) != BLKmode
           && (type = lang_hooks.types.type_for_mode (mode, 1)) != 0
           && TYPE_PRECISION (type) < TYPE_PRECISION (TREE_TYPE (exp))
-          && (optab_handler (cmp_optab, TYPE_MODE (type))->insn_code
-              != CODE_FOR_nothing))
+          && have_insn_for (COMPARE, TYPE_MODE (type)))
         {
           do_jump (fold_convert (type, exp), if_false_label, if_true_label);
           break;