From 2cd470921f6e8297cab3fbfbaa102e7245e660d6 Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Thu, 11 May 2017 14:23:16 +0000 Subject: [PATCH] dumpfile.h (TDF_FLAGS): New. * dumpfile.h (TDF_FLAGS): New. * dumpfile.c (dump_start): Use TDF_FLAGS. (dump_enable_all): Fix TDF_KIND check thinko. From-SVN: r247908 --- gcc/ChangeLog | 6 ++++++ gcc/dumpfile.c | 6 +++--- gcc/dumpfile.h | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 447f72f95ec..7d601180e84 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2017-05-11 Nathan Sidwell + + * dumpfile.h (TDF_FLAGS): New. + * dumpfile.c (dump_start): Use TDF_FLAGS. + (dump_enable_all): Fix TDF_KIND check thinko. + 2017-05-11 Kelvin Nilsen * config/rs6000/rs6000-c.c (altivec_overloaded_builtins): Add diff --git a/gcc/dumpfile.c b/gcc/dumpfile.c index 66b81a85733..d2e6d3e9b1a 100644 --- a/gcc/dumpfile.c +++ b/gcc/dumpfile.c @@ -490,7 +490,7 @@ dump_start (int phase, int *flag_ptr) dfi->pstream = stream; dump_file = dfi->pstream; /* Initialize current dump flags. */ - pflags = dfi->pflags; + pflags = TDF_FLAGS (dfi->pflags); } stream = dump_open_alternate_stream (dfi); @@ -500,7 +500,7 @@ dump_start (int phase, int *flag_ptr) count++; alt_dump_file = dfi->alt_stream; /* Initialize current -fopt-info flags. */ - alt_flags = dfi->alt_flags; + alt_flags = TDF_FLAGS (dfi->alt_flags); } if (flag_ptr) @@ -682,7 +682,7 @@ dump_enable_all (int flags, const char *filename) for (i = 0; i < m_extra_dump_files_in_use; i++) { - if (TDF_KIND (m_extra_dump_files[i].pflags) & ir_dump_type) + if (TDF_KIND (m_extra_dump_files[i].pflags) == ir_dump_type) { const char *old_filename = m_extra_dump_files[i].pfilename; m_extra_dump_files[i].pstate = -1; diff --git a/gcc/dumpfile.h b/gcc/dumpfile.h index df5203748a5..df0f11a3b77 100644 --- a/gcc/dumpfile.h +++ b/gcc/dumpfile.h @@ -55,6 +55,7 @@ enum tree_dump_index #define TDF_IPA 3 /* is an IPA dump */ #define TDF_KIND_MASK 3 #define TDF_KIND(X) ((X) & TDF_KIND_MASK) +#define TDF_FLAGS(X) ((X) & ~TDF_KIND_MASK) /* Bit 2 unused, available for hire. */ #define TDF_ADDRESS (1 << 3) /* dump node addresses */ -- 2.30.2