c-decl.c: Don't include gimple.h.

	* c-decl.c: Don't include gimple.h.
	(merge_decls): Do not copy gimple_body.

From-SVN: r159451

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 93808836514c033d130e6c87ecd28c9fe8b55186..bd584628f5117fef45f5336133c2a029d6542be2 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-16  Steven Bosscher  <steven@gcc.gnu.org>
+
+       * c-decl.c: Don't include gimple.h.
+       (merge_decls): Do not copy gimple_body.
+
 2010-05-15  Jason Merrill  <jason@redhat.com>
 
        * c.opt: Add -fnothrow-opt.

diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index 554817f548300e6ef3817269e8ea18f60fe76852..af038e1783aaa4b129b21efeb733d60b753ef03e 100644 (file)
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -51,7 +51,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "c-lang.h"
 #include "langhooks.h"
 #include "tree-mudflap.h"
-#include "gimple.h" /* FIXME: For gimple_set_body and gimple_body, but why?  */
 #include "tree-iterator.h"
 #include "diagnostic.h"
 #include "tree-dump.h"
@@ -2370,7 +2369,6 @@ merge_decls (tree newdecl, tree olddecl, tree newtype, tree oldtype)
          DECL_INITIAL (newdecl) = DECL_INITIAL (olddecl);
          DECL_STRUCT_FUNCTION (newdecl) = DECL_STRUCT_FUNCTION (olddecl);
          DECL_SAVED_TREE (newdecl) = DECL_SAVED_TREE (olddecl);
-         gimple_set_body (newdecl, gimple_body (olddecl));
          DECL_ARGUMENTS (newdecl) = copy_list (DECL_ARGUMENTS (olddecl));
          for (t = DECL_ARGUMENTS (newdecl); t ; t = TREE_CHAIN (t))
            DECL_CONTEXT (t) = newdecl;
@@ -2412,9 +2410,6 @@ merge_decls (tree newdecl, tree olddecl, tree newtype, tree oldtype)
     switch (TREE_CODE (olddecl))
       {
       case FUNCTION_DECL:
-       gimple_set_body (olddecl, gimple_body (newdecl));
-       /* fall through */
-
       case FIELD_DECL:
       case VAR_DECL:
       case PARM_DECL: