[patch][plugin] Fix bug in pass insertion
Olatunji Ruwase
tjruwase@google.com
Fri Jun 5 18:09:00 GMT 2009
Suggested changes have been made.
Thanks.
tunji
-------------- next part --------------
2009-06-05 Olatunji Ruwase <tjruwase@google.com>
* plugin.c(position_pass): Skip newly inserted pass during list
traversal to avoid repeated insertion.
2009-06-05 Olatunji Ruwase <tjruwase@google.com>
* gcc.dg/plugin/one_time_plugin.c: New test.
* gcc.dg/plugin/one_time-test-1.c: New test.
* gcc.dg/plugin/plugin.exp: Added one_time_plugin.c test.
Index: testsuite/gcc.dg/plugin/plugin.exp
===================================================================
--- testsuite/gcc.dg/plugin/plugin.exp (revision 148217)
+++ testsuite/gcc.dg/plugin/plugin.exp (working copy)
@@ -49,6 +49,7 @@ load_lib plugin-support.exp
set plugin_test_list [list \
{ selfassign.c self-assign-test-1.c self-assign-test-2.c } \
{ ggcplug.c ggcplug-test-1.c } \
+ { one_time_plugin.c one_time-test-1.c } \
]
foreach plugin_test $plugin_test_list {
Index: testsuite/gcc.dg/plugin/one_time-test-1.c
===================================================================
--- testsuite/gcc.dg/plugin/one_time-test-1.c (revision 0)
+++ testsuite/gcc.dg/plugin/one_time-test-1.c (revision 0)
@@ -0,0 +1,8 @@
+/* Test that pass is inserted and invoked once. */
+/* { dg-do compile } */
+/* { dg-options "-O" } */
+
+int main (int argc, char **argv)
+{
+ return 0;
+}
Index: testsuite/gcc.dg/plugin/one_time_plugin.c
===================================================================
--- testsuite/gcc.dg/plugin/one_time_plugin.c (revision 0)
+++ testsuite/gcc.dg/plugin/one_time_plugin.c (revision 0)
@@ -0,0 +1,60 @@
+/* Plugin that prints message if it inserted (and invoked) more than once. */
+#include "config.h"
+#include "gcc-plugin.h"
+#include "system.h"
+#include "coretypes.h"
+#include "tm.h"
+#include "toplev.h"
+#include "gimple.h"
+#include "tree-pass.h"
+#include "intl.h"
+
+static bool one_pass_gate (void)
+{
+ return true;
+}
+
+static unsigned int one_pass_exec (void)
+{
+ static int counter = 0;
+
+ if (counter > 0) {
+ printf ("Executed more than once \n");
+ }
+ counter++;
+}
+
+struct gimple_opt_pass one_pass =
+{
+ {
+ GIMPLE_PASS,
+ "useless", /* name */
+ one_pass_gate, /* gate */
+ one_pass_exec, /* execute */
+ NULL, /* sub */
+ NULL, /* next */
+ 0, /* static_pass_number */
+ 0, /* tv_id */
+ PROP_gimple_any, /* properties_required */
+ 0, /* properties_provided */
+ 0, /* properties_destroyed */
+ 0, /* todo_flags_start */
+ TODO_dump_func /* todo_flags_finish */
+ }
+};
+
+
+int plugin_init (struct plugin_name_args *plugin_info,
+ struct plugin_gcc_version *version)
+{
+ struct plugin_pass p;
+
+ p.pass = &one_pass.pass;
+ p.reference_pass_name = "useless";
+ p.ref_pass_instance_number = 1;
+ p.pos_op = PASS_POS_INSERT_AFTER;
+
+ register_callback ("one_pass", PLUGIN_PASS_MANAGER_SETUP, NULL, &p);
+
+ return 0;
+}
Index: plugin.c
===================================================================
--- plugin.c (revision 148217)
+++ plugin.c (working copy)
@@ -336,6 +336,9 @@ position_pass (struct plugin_pass *plugi
case PASS_POS_INSERT_AFTER:
new_pass->next = pass->next;
pass->next = new_pass;
+ /* Skip newly inserted pass to avoid repeated insertions in the
+ case where the new pass and the existing one have the same name. */
+ pass = new_pass;
break;
case PASS_POS_INSERT_BEFORE:
new_pass->next = pass;
More information about the Gcc-patches
mailing list