PR 99451 is about the inability to name tree and rtl dumps by plugin name. And
includes a patch. But then I worked around the problem and forgot about it.
Here it is again, retested against trunk.
ok?
nathan
--
Nathan Sidwell
From e54518bc5e59ef5cdc21c652ceac41bd0c0f436c Mon Sep 17 00:00:00 2001
From: Nathan Sidwell <nat...@acm.org>
Date: Wed, 17 May 2023 19:27:13 -0400
Subject: [PATCH] Allow plugin dumps
Defer dump option parsing until plugins are initialized. This allows one to
use plugin names for dumps.
PR other/99451
gcc/
* opts.h (handle_deferred_dump_options): Declare.
* opts-global.cc (handle_common_deferred_options): Do not handle
dump options here.
(handle_deferred_dump_options): New.
* toplev.cc (toplev::main): Call it after plugin init.
---
gcc/opts-global.cc | 20 +++++++++++++++++++-
gcc/opts.h | 1 +
gcc/toplev.cc | 4 ++++
3 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/gcc/opts-global.cc b/gcc/opts-global.cc
index 054169158b1..a61c701621d 100644
--- a/gcc/opts-global.cc
+++ b/gcc/opts-global.cc
@@ -401,7 +401,7 @@ handle_common_deferred_options (void)
break;
case OPT_fdump_:
- g->get_dumps ()->dump_switch_p (opt->arg);
+ /* Deferred until plugins initialized. */
break;
case OPT_fopt_info_:
@@ -494,3 +494,21 @@ handle_common_deferred_options (void)
}
}
}
+
+/* Handle deferred dump options. */
+
+void
+handle_deferred_dump_options (void)
+{
+ unsigned int i;
+ cl_deferred_option *opt;
+ vec<cl_deferred_option> v;
+
+ if (common_deferred_options)
+ v = *((vec<cl_deferred_option> *) common_deferred_options);
+ else
+ v = vNULL;
+ FOR_EACH_VEC_ELT (v, i, opt)
+ if (opt->opt_index == OPT_fdump_)
+ g->get_dumps ()->dump_switch_p (opt->arg);
+}
diff --git a/gcc/opts.h b/gcc/opts.h
index 9959a440ca1..00f377f9ca7 100644
--- a/gcc/opts.h
+++ b/gcc/opts.h
@@ -425,6 +425,7 @@ extern void control_warning_option (unsigned int opt_index, int kind,
extern char *write_langs (unsigned int mask);
extern void print_ignored_options (void);
extern void handle_common_deferred_options (void);
+extern void handle_deferred_dump_options (void);
unsigned int parse_sanitizer_options (const char *, location_t, int,
unsigned int, int, bool);
diff --git a/gcc/toplev.cc b/gcc/toplev.cc
index d53b5e78ae3..c606a0697b7 100644
--- a/gcc/toplev.cc
+++ b/gcc/toplev.cc
@@ -2253,6 +2253,10 @@ toplev::main (int argc, char **argv)
initialize_plugins ();
+ /* Handle the dump options now that plugins have had a chance to install new
+ passes. */
+ handle_deferred_dump_options ();
+
if (version_flag)
print_version (stderr, "", true);
--
2.40.1
