OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

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

From-SVN: r159451
This commit is contained in:
Steven Bosscher 2010-05-16 07:12:46 +00:00
parent 9feb3d6aca
commit 1d4c5fe99b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ChangeLog
View File

@ -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.

5
gcc/c-decl.c
View File

@ -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: