except.c (can_throw): Use INTVAL on a CONST_INT.

        * except.c (can_throw): Use INTVAL on a CONST_INT.
        (reachable_handlers): Likewise.
        * flow.c (count_basic_blocks, find_basic_blocks_1): Likewise.

From-SVN: r32471

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7f9297517d9da1530065559e2fb2ac225c19e9e5..57c01b258c187063c7fe35543023d0ffc72f6697 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2000-03-10  Richard Henderson  <rth@cygnus.com>
+
+       * except.c (can_throw): Use INTVAL on a CONST_INT.
+       (reachable_handlers): Likewise.
+       * flow.c (count_basic_blocks, find_basic_blocks_1): Likewise.
+
 2000-03-10  Andreas Jaeger  <aj@suse.de>
 
        * config/mips/linux.h: Undefine MD_EXEC_PREFIX and

diff --git a/gcc/except.c b/gcc/except.c
index e08ada2845662daf0dc46644a3a5b4750b52a3ab..d2c3d251719a19d96c6b4baaba1dfbcb3163d62d 100644 (file)
--- a/gcc/except.c
+++ b/gcc/except.c
@@ -2629,7 +2629,7 @@ can_throw (insn)
   if (GET_CODE (insn) == CALL_INSN)
     {
       rtx note = find_reg_note (insn, REG_EH_REGION, NULL_RTX);
-      if (!note || XINT (XEXP (note, 0), 0) > 0)
+      if (!note || INTVAL (XEXP (note, 0), 0) > 0)
        return 1;
     }
 
@@ -3390,7 +3390,7 @@ reachable_handlers (block, info, insn, handlers)
          note = find_reg_note (insn, REG_EH_REGION, NULL_RTX);
          if (note)
            {
-             int b = XINT (XEXP (note, 0), 0);
+             int b = INTVAL (XEXP (note, 0), 0);
              if (b <= 0)
                index = 0;
              else

diff --git a/gcc/flow.c b/gcc/flow.c
index 799114e736308ce1a20691e42d5f19a5be6c0505..05118223bd721c1b77c646ef7b7fb3cd4ecd8b65 100644 (file)
--- a/gcc/flow.c
+++ b/gcc/flow.c
@@ -466,7 +466,7 @@ count_basic_blocks (f)
       if (code == CALL_INSN)
        {
          rtx note = find_reg_note (insn, REG_EH_REGION, NULL_RTX);
-         int region = (note ? XWINT (XEXP (note, 0), 0) : 1);
+         int region = (note ? INTVAL (XEXP (note, 0), 0) : 1);
          prev_call = insn;
          call_had_abnormal_edge = 0;
 
@@ -540,7 +540,7 @@ find_basic_blocks_1 (f)
        {
          /* Record whether this call created an edge.  */
          rtx note = find_reg_note (insn, REG_EH_REGION, NULL_RTX);
-         int region = (note ? XWINT (XEXP (note, 0), 0) : 1);
+         int region = (note ? INTVAL (XEXP (note, 0), 0) : 1);
          call_has_abnormal_edge = 0;
 
          /* If there is an EH region or rethrow, we have an edge.  */