From: steven Date: Sun, 16 May 2010 07:12:46 +0000 (+0000) Subject: * c-decl.c: Don't include gimple.h. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49c7f2ee4988aa6be1a2d0735a2e5003aac709bf;p=thirdparty%2Fgcc.git * c-decl.c: Don't include gimple.h. (merge_decls): Do not copy gimple_body. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159451 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 93808836514c..bd584628f511 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2010-05-16 Steven Bosscher + + * c-decl.c: Don't include gimple.h. + (merge_decls): Do not copy gimple_body. + 2010-05-15 Jason Merrill * c.opt: Add -fnothrow-opt. diff --git a/gcc/c-decl.c b/gcc/c-decl.c index 554817f54830..af038e1783aa 100644 --- 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: