diff options
author | bviyer <bviyer@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-05-31 18:46:05 +0000 |
---|---|---|
committer | bviyer <bviyer@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-05-31 18:46:05 +0000 |
commit | 3e76c73d74408b80d7e33a9589021ab05ae0f94d (patch) | |
tree | eec692b17e05c30eceb8a803d7f44094c82ca16c /gcc/c-decl.c | |
parent | 1dbe1bb19c674745941ca05ed462363916ae8705 (diff) | |
parent | 9635c0c3aa804dd411dfdcaa3322bd6096dbaf0c (diff) | |
download | gcc-3e76c73d74408b80d7e33a9589021ab05ae0f94d.tar.gz |
Merged with trunk at revision 188063.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/cilkplus@188074 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/c-decl.c')
-rw-r--r-- | gcc/c-decl.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/gcc/c-decl.c b/gcc/c-decl.c index 00cd92c864b..050ee84eaba 100644 --- a/gcc/c-decl.c +++ b/gcc/c-decl.c @@ -7329,8 +7329,6 @@ finish_struct (location_t loc, tree t, tree fieldlist, tree attributes, if (c_dialect_objc ()) objc_check_decl (decl); rest_of_decl_compilation (decl, toplevel, 0); - if (!toplevel) - expand_decl (decl); } } C_TYPE_INCOMPLETE_VARS (TYPE_MAIN_VARIANT (t)) = 0; @@ -8591,11 +8589,9 @@ check_for_loop_decls (location_t loc, bool turn_off_iso_c99_error) void c_push_function_context (void) { - struct language_function *p = cfun->language; - /* cfun->language might have been already allocated by the use of - -Wunused-local-typedefs. In that case, just re-use it. */ - if (p == NULL) - cfun->language = p = ggc_alloc_cleared_language_function (); + struct language_function *p; + p = ggc_alloc_language_function (); + cfun->language = p; p->base.x_stmt_tree = c_stmt_tree; c_stmt_tree.x_cur_stmt_list @@ -8621,11 +8617,7 @@ c_pop_function_context (void) pop_function_context (); p = cfun->language; - /* When -Wunused-local-typedefs is in effect, cfun->languages is - used to store data throughout the life time of the current cfun, - So don't deallocate it. */ - if (!warn_unused_local_typedefs) - cfun->language = NULL; + cfun->language = NULL; if (DECL_STRUCT_FUNCTION (current_function_decl) == 0 && DECL_SAVED_TREE (current_function_decl) == NULL_TREE) |