* doc/plugins.texi (enum plugin_event): New event.

        * plugin.c (register_callback): Handle PLUGIN_START_PARSE_FUNCTION
        and PLUGIN_FINISH_FUNCTION.
        * plugin.def (PLUGIN_START_PARSE_FUNCTION): Add plugin event
        (PLUGIN_FINISH_PARSE_FUNCTION): Likewise.

cp/

        * decl.c (start_function): Call plugin before parsing.
        (finish_function): Call plugin after parsing.

c/

        * c-decl.c (start_function): Call plugin before parsing.
        (finish_function): Call plugin after parsing.

testsuite/

        * g++.dg/plugin/plugin.exp: Add def-plugin-test.C.
        * g++.dg/plugin/def_plugin.c: New file.
        * g++.dg/plugin/def-plugin-test.C: New file.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@224078 138bc75d-0d04-0410-961f-82ee72b054a4

12 files changed, 99 insertions, 1 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f4d83dbfb6f..ae786097711 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2015-06-02  Andres Tiraboschi  <andres.tiraboschi@tallertechnologies.com>
+	
+	* doc/plugins.texi (enum plugin_event): New event.
+	* plugin.c (register_callback): Handle PLUGIN_START_PARSE_FUNCTION
+	and PLUGIN_FINISH_FUNCTION.
+	* plugin.def (PLUGIN_START_PARSE_FUNCTION): Add plugin event
+	(PLUGIN_FINISH_PARSE_FUNCTION): Likewise.
+
 2015-06-03  Richard Biener  <rguenther@suse.de>
 
 	* tree-vect-data-refs.c (vect_analyze_group_access): Properly
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 20122e60f9e..a4bf6203ccf 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-02  Andres Tiraboschi  <andres.tiraboschi@tallertechnologies.com>
+
+	* c-decl.c (start_function): Call plugin before parsing.
+	(finish_function): Call plugin after parsing.
+
 2015-06-02  Prathamesh Kulkarni  <prathamesh.kulkarni@linaro.org>
 
 	PR c/49551
diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c
index 68c79df63e6..efdf9028596 100644
--- a/gcc/c/c-decl.c
+++ b/gcc/c/c-decl.c
@@ -8239,6 +8239,7 @@ start_function (struct c_declspecs *declspecs, struct c_declarator *declarator,
 
   decl1 = grokdeclarator (declarator, declspecs, FUNCDEF, true, NULL,
 			  &attributes, NULL, NULL, DEPRECATED_NORMAL);
+  invoke_plugin_callbacks (PLUGIN_START_PARSE_FUNCTION, decl1);
 
   /* If the declarator is not suitable for a function definition,
      cause a syntax error.  */
@@ -9083,6 +9084,7 @@ finish_function (void)
      It's still in DECL_STRUCT_FUNCTION, and we'll restore it in
      tree_rest_of_compilation.  */
   set_cfun (NULL);
+  invoke_plugin_callbacks (PLUGIN_FINISH_PARSE_FUNCTION, current_function_decl);
   current_function_decl = NULL;
 }
 
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index b6a8ab54661..fe1f7bb03d1 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-02  Andres Tiraboschi  <andres.tiraboschi@tallertechnologies.com>
+
+	* decl.c (start_function): Call plugin before parsing.
+	(finish_function): Call plugin after parsing.
+
 2015-06-02  Patrick Palka <patrick@parcs.ath.cx>
 
 	* cp-tree.h (init_error): Remove declaration.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index a8cb358965e..6140ab6770a 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -13748,6 +13748,7 @@ start_function (cp_decl_specifier_seq *declspecs,
   tree decl1;
 
   decl1 = grokdeclarator (declarator, declspecs, FUNCDEF, 1, &attrs);
+  invoke_plugin_callbacks (PLUGIN_START_PARSE_FUNCTION, decl1);
   if (decl1 == error_mark_node)
     return false;
   /* If the declarator is not suitable for a function definition,
@@ -14386,6 +14387,7 @@ finish_function (int flags)
       vec_free (deferred_mark_used_calls);
     }
 
+  invoke_plugin_callbacks (PLUGIN_FINISH_PARSE_FUNCTION, fndecl);
   return fndecl;
 }
 
diff --git a/gcc/doc/plugins.texi b/gcc/doc/plugins.texi
index c6caa19eb15..d50f25c79ad 100644
--- a/gcc/doc/plugins.texi
+++ b/gcc/doc/plugins.texi
@@ -174,6 +174,8 @@ Callbacks can be invoked at the following pre-determined events:
 @smallexample
 enum plugin_event
 @{
+  PLUGIN_START_PARSE_FUNCTION,  /* Called before parsing the body of a function. */
+  PLUGIN_FINISH_PARSE_FUNCTION, /* After finishing parsing a function. */
   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. */
diff --git a/gcc/plugin.c b/gcc/plugin.c
index 6a7654f0464..ed4a2c5dc46 100644
--- a/gcc/plugin.c
+++ b/gcc/plugin.c
@@ -441,6 +441,8 @@ register_callback (const char *plugin_name,
 	    return;
 	  }
       /* Fall through.  */
+      case PLUGIN_START_PARSE_FUNCTION:
+      case PLUGIN_FINISH_PARSE_FUNCTION:
       case PLUGIN_FINISH_TYPE:
       case PLUGIN_FINISH_DECL:
       case PLUGIN_START_UNIT:
@@ -519,6 +521,8 @@ invoke_plugin_callbacks_full (int event, void *gcc_data)
 	gcc_assert (event >= PLUGIN_EVENT_FIRST_DYNAMIC);
 	gcc_assert (event < event_last);
       /* Fall through.  */
+      case PLUGIN_START_PARSE_FUNCTION:
+      case PLUGIN_FINISH_PARSE_FUNCTION:
       case PLUGIN_FINISH_TYPE:
       case PLUGIN_FINISH_DECL:
       case PLUGIN_START_UNIT:
diff --git a/gcc/plugin.def b/gcc/plugin.def
index 98c988ab164..2a7e4c21df3 100644
--- a/gcc/plugin.def
+++ b/gcc/plugin.def
@@ -17,6 +17,11 @@ You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  */
 
+/* Called before parsing the body of a function.  */
+DEFEVENT (PLUGIN_START_PARSE_FUNCTION)
+
+/* After finishing parsing a function. */
+DEFEVENT (PLUGIN_FINISH_PARSE_FUNCTION)
 
 /* To hook into pass manager.  */
 DEFEVENT (PLUGIN_PASS_MANAGER_SETUP)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 43604b732dc..13e7ecb4a14 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2015-06-02  Andres Tiraboschi  <andres.tiraboschi@tallertechnologies.com>
+
+	* g++.dg/plugin/plugin.exp: Add def-plugin-test.C.
+	* g++.dg/plugin/def_plugin.c: New file.
+	* g++.dg/plugin/def-plugin-test.C: New file.
+
 2015-06-03  Richard Biener  <rguenther@suse.de>
 
 	* gcc.dg/vect/bb-slp-36.c: New testcase.
diff --git a/gcc/testsuite/g++.dg/plugin/def-plugin-test.C b/gcc/testsuite/g++.dg/plugin/def-plugin-test.C
new file mode 100644
index 00000000000..b7f2d3d3fa9
--- /dev/null
+++ b/gcc/testsuite/g++.dg/plugin/def-plugin-test.C
@@ -0,0 +1,13 @@
+int global = 12;
+
+int function1(void);
+
+int function2(int a) // { dg-warning "Start fndef function2" }
+{
+  return function1() + a;
+} //  { dg-warning "Finish fndef function2" }
+
+int function1(void) // { dg-warning "Start fndef function1" }
+{
+  return global + 1;
+} //  { dg-warning "Finish fndef function1" }
diff --git a/gcc/testsuite/g++.dg/plugin/def_plugin.c b/gcc/testsuite/g++.dg/plugin/def_plugin.c
new file mode 100644
index 00000000000..63983c5f183
--- /dev/null
+++ b/gcc/testsuite/g++.dg/plugin/def_plugin.c
@@ -0,0 +1,45 @@
+/* A plugin example that shows which function definitions are caught by PLUGIN_START_FUNCTION and PLUGIN_FINISH_FUNCTION */
+
+#include "gcc-plugin.h"
+#include <stdlib.h>
+#include "config.h"
+#include "system.h"
+#include "coretypes.h"
+#include "tree.h"
+#include "tree-pass.h"
+#include "intl.h"
+#include "diagnostic.h"
+
+int plugin_is_GPL_compatible;
+
+/* Callback function to invoke when GCC starts a function definition*/
+
+void plugin_start_parse_function (void *event_data, void *data)
+{
+  tree fndef = (tree) event_data;
+  warning (0, G_("Start fndef %s"),
+           IDENTIFIER_POINTER (DECL_NAME (fndef)));
+}
+
+/* Callback function to invoke after GCC finishes a function definition. */
+
+void plugin_finish_parse_function (void *event_data, void *data)
+{
+  tree fndef = (tree) event_data;
+  warning (0, G_("Finish fndef %s"),
+           IDENTIFIER_POINTER (DECL_NAME (fndef)));
+}
+
+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_START_PARSE_FUNCTION,
+                     plugin_start_parse_function, NULL);
+
+  register_callback (plugin_name, PLUGIN_FINISH_PARSE_FUNCTION,
+                     plugin_finish_parse_function, NULL);
+  return 0;
+}
diff --git a/gcc/testsuite/g++.dg/plugin/plugin.exp b/gcc/testsuite/g++.dg/plugin/plugin.exp
index 1051207a1b1..3ed13974124 100644
--- a/gcc/testsuite/g++.dg/plugin/plugin.exp
+++ b/gcc/testsuite/g++.dg/plugin/plugin.exp
@@ -61,7 +61,8 @@ set plugin_test_list [list \
     { 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 } \
-    { decl_plugin.c decl-plugin-test.C } ]
+    { decl_plugin.c decl-plugin-test.C } \
+    { def_plugin.c def-plugin-test.C } ]
 
 foreach plugin_test $plugin_test_list {
     # Replace each source file with its full-path name