From c84e2d3d18338e1644e34c01809833419c13dd3d Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 28 Mar 2019 15:07:40 +0100 Subject: [PATCH] rtl.h (NONDEBUG_INSN_P): Define as NONJUMP_INSN_P or JUMP_P or CALL_P instead of INSN_P && !DEBUG_INSN_P. * rtl.h (NONDEBUG_INSN_P): Define as NONJUMP_INSN_P or JUMP_P or CALL_P instead of INSN_P && !DEBUG_INSN_P. (INSN_P): Define using NONDEBUG_INSN_P or DEBUG_INSN_P. From-SVN: r269991 --- gcc/ChangeLog | 6 ++++++ gcc/rtl.h | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2a8529928c8..2ef15e9e352 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2019-03-28 Jakub Jelinek + + * rtl.h (NONDEBUG_INSN_P): Define as NONJUMP_INSN_P or JUMP_P + or CALL_P instead of INSN_P && !DEBUG_INSN_P. + (INSN_P): Define using NONDEBUG_INSN_P or DEBUG_INSN_P. + 2019-03-28 Jonathan Wakely PR c/79022 diff --git a/gcc/rtl.h b/gcc/rtl.h index f99191983d3..1a021fbec5f 100644 --- a/gcc/rtl.h +++ b/gcc/rtl.h @@ -840,7 +840,7 @@ struct GTY(()) rtvec_def { #define DEBUG_INSN_P(X) (GET_CODE (X) == DEBUG_INSN) /* Predicate yielding nonzero iff X is an insn that is not a debug insn. */ -#define NONDEBUG_INSN_P(X) (INSN_P (X) && !DEBUG_INSN_P (X)) +#define NONDEBUG_INSN_P(X) (NONJUMP_INSN_P (X) || JUMP_P (X) || CALL_P (X)) /* Nonzero if DEBUG_MARKER_INSN_P may possibly hold. */ #define MAY_HAVE_DEBUG_MARKER_INSNS debug_nonbind_markers_p @@ -851,8 +851,7 @@ struct GTY(()) rtvec_def { (MAY_HAVE_DEBUG_MARKER_INSNS || MAY_HAVE_DEBUG_BIND_INSNS) /* Predicate yielding nonzero iff X is a real insn. */ -#define INSN_P(X) \ - (NONJUMP_INSN_P (X) || DEBUG_INSN_P (X) || JUMP_P (X) || CALL_P (X)) +#define INSN_P(X) (NONDEBUG_INSN_P (X) || DEBUG_INSN_P (X)) /* Predicate yielding nonzero iff X is a note insn. */ #define NOTE_P(X) (GET_CODE (X) == NOTE) -- 2.30.2