Remove dump_file_info::dump_file_info and replace it with macro.

2017-05-30  Martin Liska  <mliska@suse.cz>

	* dumpfile.c: Use newly added macro DUMP_FILE_INFO.
	* dumpfile.h (struct dump_file_info): Remove ctors.

From-SVN: r248617
This commit is contained in:
Martin Liska 2017-05-30 09:35:23 +02:00 committed by Martin Liska
parent 59075bc808
commit 63523736d0
3 changed files with 19 additions and 35 deletions

View File

@ -1,3 +1,8 @@
2017-05-30 Martin Liska <mliska@suse.cz>
* dumpfile.c: Use newly added macro DUMP_FILE_INFO.
* dumpfile.h (struct dump_file_info): Remove ctors.
2017-05-30 Martin Liska <mliska@suse.cz>
* predict.def: Fix GNU coding style.

View File

@ -47,41 +47,27 @@ FILE *alt_dump_file = NULL;
const char *dump_file_name;
dump_flags_t dump_flags;
CONSTEXPR dump_file_info::dump_file_info (): suffix (NULL), swtch (NULL),
glob (NULL), pfilename (NULL), alt_filename (NULL), pstream (NULL),
alt_stream (NULL), dkind (DK_none), pflags (), alt_flags (0),
optgroup_flags (0), pstate (0), alt_state (0), num (0), owns_strings (false),
graph_dump_initialized (false)
{
}
dump_file_info::dump_file_info (const char *_suffix, const char *_swtch,
dump_kind _dkind, int _num):
suffix (_suffix), swtch (_swtch), glob (NULL),
pfilename (NULL), alt_filename (NULL), pstream (NULL), alt_stream (NULL),
dkind (_dkind), pflags (), alt_flags (0), optgroup_flags (0),
pstate (0), alt_state (0), num (_num), owns_strings (false),
graph_dump_initialized (false)
{
}
#define DUMP_FILE_INFO(suffix, swtch, dkind, num) \
{suffix, swtch, NULL, NULL, NULL, NULL, NULL, dkind, 0, 0, 0, 0, 0, num, \
false, false}
/* Table of tree dump switches. This must be consistent with the
TREE_DUMP_INDEX enumeration in dumpfile.h. */
static struct dump_file_info dump_files[TDI_end] =
{
dump_file_info (),
dump_file_info (".cgraph", "ipa-cgraph", DK_ipa, 0),
dump_file_info (".type-inheritance", "ipa-type-inheritance", DK_ipa, 0),
dump_file_info (".ipa-clones", "ipa-clones", DK_ipa, 0),
dump_file_info (".original", "tree-original", DK_tree, 3),
dump_file_info (".gimple", "tree-gimple", DK_tree, 4),
dump_file_info (".nested", "tree-nested", DK_tree, 5),
DUMP_FILE_INFO (NULL, NULL, DK_none, 0),
DUMP_FILE_INFO (".cgraph", "ipa-cgraph", DK_ipa, 0),
DUMP_FILE_INFO (".type-inheritance", "ipa-type-inheritance", DK_ipa, 0),
DUMP_FILE_INFO (".ipa-clones", "ipa-clones", DK_ipa, 0),
DUMP_FILE_INFO (".original", "tree-original", DK_tree, 3),
DUMP_FILE_INFO (".gimple", "tree-gimple", DK_tree, 4),
DUMP_FILE_INFO (".nested", "tree-nested", DK_tree, 5),
#define FIRST_AUTO_NUMBERED_DUMP 3
dump_file_info (NULL, "lang-all", DK_lang, 0),
dump_file_info (NULL, "tree-all", DK_tree, 0),
dump_file_info (NULL, "rtl-all", DK_rtl, 0),
dump_file_info (NULL, "ipa-all", DK_ipa, 0),
DUMP_FILE_INFO (NULL, "lang-all", DK_lang, 0),
DUMP_FILE_INFO (NULL, "tree-all", DK_tree, 0),
DUMP_FILE_INFO (NULL, "rtl-all", DK_rtl, 0),
DUMP_FILE_INFO (NULL, "ipa-all", DK_ipa, 0),
};
/* Define a name->number mapping for a dump flag value. */

View File

@ -120,13 +120,6 @@ typedef uint64_t dump_flags_t;
/* Define a tree dump switch. */
struct dump_file_info
{
/* Constructor. */
CONSTEXPR dump_file_info ();
/* Constructor. */
dump_file_info (const char *_suffix, const char *_swtch, dump_kind _dkind,
int _num);
/* Suffix to give output file. */
const char *suffix;
/* Command line dump switch. */