From patchwork Thu Aug 11 12:59:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: plugin event for C/C++ declarations Date: Thu, 11 Aug 2011 02:59:35 -0000 From: Romain GEISSLER X-Patchwork-Id: 109609 Message-Id: <4E43D237.6090304@st.com> To: Diego Novillo Cc: Romain Geissler , "gcc-patches@gcc.gnu.org" , "bhackett1024@gmail.com" On 08/10/2011 05:20 PM, Diego Novillo wrote: > On Mon, Aug 8, 2011 at 07:39, Romain Geissler wrote: >> 2011/7/20 Diego Novillo: >>> On Mon, Jul 18, 2011 at 03:06, Romain Geissler >>> I will commit this patch shortly. >>> >>> >>> Diego. >>> >> >> Ping ! > > Romain, please send me a current patch against today's trunk. > > > Thanks. Diego. Hi Find attached the updated patch. Retested for regression on x86_64. Romain Geissler. Index: gcc/doc/plugins.texi =================================================================== --- gcc/doc/plugins.texi (revision 177557) +++ gcc/doc/plugins.texi (working copy) @@ -151,6 +151,7 @@ enum plugin_event @{ PLUGIN_PASS_MANAGER_SETUP, /* To hook into pass manager. */ PLUGIN_FINISH_TYPE, /* After finishing parsing a type. */ + PLUGIN_FINISH_DECL, /* After finishing parsing a declaration. */ PLUGIN_FINISH_UNIT, /* Useful for summary processing. */ PLUGIN_PRE_GENERICIZE, /* Allows to see low level AST in C and C++ frontends. */ PLUGIN_FINISH, /* Called before GCC exits. */ Index: gcc/plugin.def =================================================================== --- gcc/plugin.def (revision 177557) +++ gcc/plugin.def (working copy) @@ -24,6 +24,9 @@ DEFEVENT (PLUGIN_PASS_MANAGER_SETUP) /* After finishing parsing a type. */ DEFEVENT (PLUGIN_FINISH_TYPE) +/* After finishing parsing a declaration. */ +DEFEVENT (PLUGIN_FINISH_DECL) + /* Useful for summary processing. */ DEFEVENT (PLUGIN_FINISH_UNIT) Index: gcc/testsuite/g++.dg/plugin/plugin.exp =================================================================== --- gcc/testsuite/g++.dg/plugin/plugin.exp (revision 177557) +++ gcc/testsuite/g++.dg/plugin/plugin.exp (working copy) @@ -51,7 +51,8 @@ set plugin_test_list [list \ { pragma_plugin.c pragma_plugin-test-1.C } \ { selfassign.c self-assign-test-1.C self-assign-test-2.C self-assign-test-3.C } \ { dumb_plugin.c dumb-plugin-test-1.C } \ - { header_plugin.c header-plugin-test.C } ] + { header_plugin.c header-plugin-test.C } \ + { decl_plugin.c decl-plugin-test.C } ] foreach plugin_test $plugin_test_list { # Replace each source file with its full-path name Index: gcc/testsuite/g++.dg/plugin/decl-plugin-test.C =================================================================== --- gcc/testsuite/g++.dg/plugin/decl-plugin-test.C (revision 0) +++ gcc/testsuite/g++.dg/plugin/decl-plugin-test.C (revision 0) @@ -0,0 +1,30 @@ +extern int global; // { dg-warning "Decl Global global" } +int global_array[] = { 1, 2, 3 }; // { dg-warning "Decl Global global_array" } + +int takes_args(int arg1, int arg2) +{ + int local = arg1 + arg2 + global; // { dg-warning "Decl Local local" } + return local + 1; +} + +int global = 12; // { dg-warning "Decl Global global" } + +struct test_str { + int field; // { dg-warning "Decl Field field" } +}; + +class test_class { + int class_field1; // { dg-warning "Decl Field class_field1" } + int class_field2; // { dg-warning "Decl Field class_field2" } + + test_class() // { dg-warning "Decl Function test_class" } + : class_field1(0), class_field2(0) + {} + + void swap_fields(int bias) // { dg-warning "Decl Function swap_fields" } + { + int temp = class_field1 + bias; // { dg-warning "Decl Local temp" } + class_field1 = class_field2 - bias; + class_field2 = temp; + } +}; Index: gcc/testsuite/g++.dg/plugin/decl_plugin.c =================================================================== --- gcc/testsuite/g++.dg/plugin/decl_plugin.c (revision 0) +++ gcc/testsuite/g++.dg/plugin/decl_plugin.c (revision 0) @@ -0,0 +1,51 @@ +/* A plugin example that shows which declarations are caught by FINISH_DECL */ + +#include "gcc-plugin.h" +#include +#include "config.h" +#include "system.h" +#include "coretypes.h" +#include "tree.h" +#include "tree-pass.h" +#include "intl.h" + +int plugin_is_GPL_compatible; + +/* Callback function to invoke after GCC finishes a declaration. */ + +void plugin_finish_decl (void *event_data, void *data) +{ + tree decl = (tree) event_data; + + const char *kind = NULL; + switch (TREE_CODE(decl)) { + case FUNCTION_DECL: + kind = "Function"; break; + case PARM_DECL: + kind = "Parameter"; break; + case VAR_DECL: + if (DECL_FILE_SCOPE_P(decl)) + kind = "Global"; + else + kind = "Local"; + break; + case FIELD_DECL: + kind = "Field"; break; + default: + kind = "Unknown"; + } + + warning (0, G_("Decl %s %s"), + kind, IDENTIFIER_POINTER (DECL_NAME (decl))); +} + +int +plugin_init (struct plugin_name_args *plugin_info, + struct plugin_gcc_version *version) +{ + const char *plugin_name = plugin_info->base_name; + + register_callback (plugin_name, PLUGIN_FINISH_DECL, + plugin_finish_decl, NULL); + return 0; +} Index: gcc/cp/decl.c =================================================================== --- gcc/cp/decl.c (revision 177557) +++ gcc/cp/decl.c (working copy) @@ -6311,6 +6311,8 @@ cp_finish_decl (tree decl, tree init, bo if (was_readonly) TREE_READONLY (decl) = 1; + + invoke_plugin_callbacks (PLUGIN_FINISH_DECL, decl); } /* Returns a declaration for a VAR_DECL as if: Index: gcc/c-decl.c =================================================================== --- gcc/c-decl.c (revision 177557) +++ gcc/c-decl.c (working copy) @@ -4466,6 +4466,8 @@ finish_decl (tree decl, location_t init_ && C_TYPE_FIELDS_READONLY (type)) diagnose_uninitialized_cst_member (decl, type); } + + invoke_plugin_callbacks (PLUGIN_FINISH_DECL, decl); } /* Given a parsed parameter declaration, decode it into a PARM_DECL. Index: gcc/plugin.c =================================================================== --- gcc/plugin.c (revision 177557) +++ gcc/plugin.c (working copy) @@ -420,6 +420,7 @@ register_callback (const char *plugin_na } /* Fall through. */ case PLUGIN_FINISH_TYPE: + case PLUGIN_FINISH_DECL: case PLUGIN_START_UNIT: case PLUGIN_FINISH_UNIT: case PLUGIN_PRE_GENERICIZE: @@ -496,6 +497,7 @@ invoke_plugin_callbacks_full (int event, gcc_assert (event < event_last); /* Fall through. */ case PLUGIN_FINISH_TYPE: + case PLUGIN_FINISH_DECL: case PLUGIN_START_UNIT: case PLUGIN_FINISH_UNIT: case PLUGIN_PRE_GENERICIZE: