This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[patch] Finish cleaning up gimple.h
- From: Andrew MacLeod <amacleod at redhat dot com>
- To: gcc-patches <gcc-patches at gcc dot gnu dot org>
- Cc: Richard Biener <richard dot guenther at gmail dot com>, Jeff Law <law at redhat dot com>, Diego Novillo <dnovillo at google dot com>
- Date: Fri, 15 Nov 2013 11:47:47 -0500
- Subject: [patch] Finish cleaning up gimple.h
- Authentication-results: sourceware.org; auth=none
This patch finally gets gimple.h into its proper state of only having
prototypes for gimple.c.
The prototype for get_base_address was in tree.h, and it seemed more
appropriate there since gimple.h is for gimple statements. I moved the
function to tree.c
2 new .h files were created, cfgexpand.h and tree-nested.h. I flushed
both of those out to include all the exports for the files, so the
'build_addr' prototype was moved from tree.h and
'estimated_stack_frame_size' was moved from tree-inline.h. I looked at
shuffling the exports to other files, but nothing jumped at me.
estimated_stack_frame_size depends on too much other stuff in cfgexpand
to move even though it only has one client.
build_addr may belong somewhere else, but Im not sure where... tree.c as
well maybe? The fortran FE uses it as well...
A few #includes needed to be added to .c files for the moved prototypes.
I left the macro definitions for SCALE, LABEL and PERCENT at the bottom
of gimple.h. I was going to move them, but really have no idea where to
put them. I thought about coretypes.h but that doesn't seem right
either. suggestions?
Bootstraps on x86_64-unknown-linux-gnu and regressions are currently
running. Assuming no issues, OK?
Andrew
PS The final step will be to flatten this file to get the #includes out
to the relevant .c files.
* gimple.h: Reorder prototypes to match .c declaration order, and remove
protyotypes for functions not in gimple.c.
* gimple.c: Remove unused prototypes.
(get_base_address): Move to tree.c.
* tree.c (get_base_address): Relocate from gimple.c.
* builtins.h (validate_gimple_arglist): Add prototype.
* trans-mem.h (compute_transaction_bits, is_tm_ending): Add prototype.
* cfgexpand.h: New File.
(gimple_assign_rhs_to_tree, estimated_stack_frame_size): Add protoype.
* tree.h (build_addr): Move to tree-nested.h.
* tree-nested.h: New File.
(build_addr, lower_nested_functions, insert_field_into_struct): Add
prototypes.
* tree-inline.h (estimated_stack_frame_size): Remove prototype.
* ipa-inline-analysis.c: Include cfgexpand.h.
* cgraphunit.c: Include tree-nested.h.
* omp-low.c: Likewise.
* tree-parloops.c: Likewise.
* gimple-low.h: Likewise.
* tree-profile.h: Likewise.
* expr.c: Include cfgexpand.h.
* tree-affine.c: Likewise.
* tree-ssa.c: Likewise.
* tree-ssa-loop-im.c: Include trans-mem.h.
* tree-ssa-tail-merge.c: Likewise.
* value-prof.c: Include builtins.h and tree-nested.h.
* fortran/trans-intrinsic.c: Include tree-nested.h.
Index: gimple.h
===================================================================
*** gimple.h (revision 204833)
--- gimple.h (working copy)
*************** extern enum gimple_statement_structure_e
*** 726,757 ****
of comminucating the profile info to the builtin expanders. */
extern gimple currently_expanding_gimple_stmt;
gimple gimple_build_return (tree);
!
! gimple gimple_build_assign_stat (tree, tree MEM_STAT_DECL);
! #define gimple_build_assign(l,r) gimple_build_assign_stat (l, r MEM_STAT_INFO)
!
! gimple
! gimple_build_assign_with_ops (enum tree_code, tree,
! tree, tree CXX_MEM_STAT_INFO);
! gimple
! gimple_build_assign_with_ops (enum tree_code, tree,
! tree, tree, tree CXX_MEM_STAT_INFO);
!
! gimple gimple_build_debug_bind_stat (tree, tree, gimple MEM_STAT_DECL);
! #define gimple_build_debug_bind(var,val,stmt) \
! gimple_build_debug_bind_stat ((var), (val), (stmt) MEM_STAT_INFO)
! gimple gimple_build_debug_source_bind_stat (tree, tree, gimple MEM_STAT_DECL);
! #define gimple_build_debug_source_bind(var,val,stmt) \
! gimple_build_debug_source_bind_stat ((var), (val), (stmt) MEM_STAT_INFO)
!
gimple gimple_build_call_vec (tree, vec<tree> );
gimple gimple_build_call (tree, unsigned, ...);
gimple gimple_build_call_valist (tree, unsigned, va_list);
gimple gimple_build_call_internal (enum internal_fn, unsigned, ...);
gimple gimple_build_call_internal_vec (enum internal_fn, vec<tree> );
gimple gimple_build_call_from_tree (tree);
gimple gimple_build_cond (enum tree_code, tree, tree, tree, tree);
gimple gimple_build_label (tree label);
gimple gimple_build_goto (tree dest);
gimple gimple_build_nop (void);
--- 726,751 ----
of comminucating the profile info to the builtin expanders. */
extern gimple currently_expanding_gimple_stmt;
+ #define gimple_alloc(c, n) gimple_alloc_stat (c, n MEM_STAT_INFO)
+ gimple gimple_alloc_stat (enum gimple_code, unsigned MEM_STAT_DECL);
gimple gimple_build_return (tree);
! void gimple_call_reset_alias_info (gimple);
gimple gimple_build_call_vec (tree, vec<tree> );
gimple gimple_build_call (tree, unsigned, ...);
gimple gimple_build_call_valist (tree, unsigned, va_list);
gimple gimple_build_call_internal (enum internal_fn, unsigned, ...);
gimple gimple_build_call_internal_vec (enum internal_fn, vec<tree> );
gimple gimple_build_call_from_tree (tree);
+ extern unsigned gimple_call_get_nobnd_arg_index (const_gimple, unsigned);
+ gimple gimple_build_assign_stat (tree, tree MEM_STAT_DECL);
+ #define gimple_build_assign(l,r) gimple_build_assign_stat (l, r MEM_STAT_INFO)
+ gimple gimple_build_assign_with_ops (enum tree_code, tree,
+ tree, tree, tree CXX_MEM_STAT_INFO);
+ gimple gimple_build_assign_with_ops (enum tree_code, tree,
+ tree, tree CXX_MEM_STAT_INFO);
gimple gimple_build_cond (enum tree_code, tree, tree, tree, tree);
+ gimple gimple_build_cond_from_tree (tree, tree, tree);
+ void gimple_cond_set_condition_from_tree (gimple, tree);
gimple gimple_build_label (tree label);
gimple gimple_build_goto (tree dest);
gimple gimple_build_nop (void);
*************** gimple gimple_build_eh_else (gimple_seq,
*** 766,804 ****
gimple gimple_build_try (gimple_seq, gimple_seq, enum gimple_try_flags);
gimple gimple_build_wce (gimple_seq);
gimple gimple_build_resx (int);
- gimple gimple_build_eh_dispatch (int);
gimple gimple_build_switch_nlabels (unsigned, tree, tree);
gimple gimple_build_switch (tree, tree, vec<tree> );
gimple gimple_build_omp_parallel (gimple_seq, tree, tree, tree);
gimple gimple_build_omp_task (gimple_seq, tree, tree, tree, tree, tree, tree);
- gimple gimple_build_omp_for (gimple_seq, int, tree, size_t, gimple_seq);
- gimple gimple_build_omp_critical (gimple_seq, tree);
gimple gimple_build_omp_section (gimple_seq);
- gimple gimple_build_omp_continue (tree, tree);
gimple gimple_build_omp_master (gimple_seq);
gimple gimple_build_omp_taskgroup (gimple_seq);
! gimple gimple_build_omp_return (bool);
gimple gimple_build_omp_ordered (gimple_seq);
gimple gimple_build_omp_sections (gimple_seq, tree);
gimple gimple_build_omp_sections_switch (void);
gimple gimple_build_omp_single (gimple_seq, tree);
gimple gimple_build_omp_target (gimple_seq, int, tree);
gimple gimple_build_omp_teams (gimple_seq, tree);
- gimple gimple_build_cdt (tree, tree);
gimple gimple_build_omp_atomic_load (tree, tree);
gimple gimple_build_omp_atomic_store (tree);
gimple gimple_build_transaction (gimple_seq, tree);
gimple gimple_build_predict (enum br_predictor, enum prediction);
! enum gimple_statement_structure_enum gss_for_assign (enum tree_code);
! gimple_seq gimple_seq_alloc (void);
! void gimple_seq_free (gimple_seq);
void gimple_seq_add_seq (gimple_seq *, gimple_seq);
gimple_seq gimple_seq_copy (gimple_seq);
bool gimple_call_same_target_p (const_gimple, const_gimple);
int gimple_call_flags (const_gimple);
- int gimple_call_return_flags (const_gimple);
int gimple_call_arg_flags (const_gimple, unsigned);
! void gimple_call_reset_alias_info (gimple);
bool gimple_assign_copy_p (gimple);
bool gimple_assign_ssa_name_copy_p (gimple);
bool gimple_assign_unary_nop_p (gimple);
--- 760,805 ----
gimple gimple_build_try (gimple_seq, gimple_seq, enum gimple_try_flags);
gimple gimple_build_wce (gimple_seq);
gimple gimple_build_resx (int);
gimple gimple_build_switch_nlabels (unsigned, tree, tree);
gimple gimple_build_switch (tree, tree, vec<tree> );
+ gimple gimple_build_eh_dispatch (int);
+ gimple gimple_build_debug_bind_stat (tree, tree, gimple MEM_STAT_DECL);
+ #define gimple_build_debug_bind(var,val,stmt) \
+ gimple_build_debug_bind_stat ((var), (val), (stmt) MEM_STAT_INFO)
+ gimple gimple_build_debug_source_bind_stat (tree, tree, gimple MEM_STAT_DECL);
+ #define gimple_build_debug_source_bind(var,val,stmt) \
+ gimple_build_debug_source_bind_stat ((var), (val), (stmt) MEM_STAT_INFO)
+ gimple gimple_build_omp_critical (gimple_seq, tree);
+ gimple gimple_build_omp_for (gimple_seq, int, tree, size_t, gimple_seq);
gimple gimple_build_omp_parallel (gimple_seq, tree, tree, tree);
gimple gimple_build_omp_task (gimple_seq, tree, tree, tree, tree, tree, tree);
gimple gimple_build_omp_section (gimple_seq);
gimple gimple_build_omp_master (gimple_seq);
gimple gimple_build_omp_taskgroup (gimple_seq);
! gimple gimple_build_omp_continue (tree, tree);
gimple gimple_build_omp_ordered (gimple_seq);
+ gimple gimple_build_omp_return (bool);
gimple gimple_build_omp_sections (gimple_seq, tree);
gimple gimple_build_omp_sections_switch (void);
gimple gimple_build_omp_single (gimple_seq, tree);
gimple gimple_build_omp_target (gimple_seq, int, tree);
gimple gimple_build_omp_teams (gimple_seq, tree);
gimple gimple_build_omp_atomic_load (tree, tree);
gimple gimple_build_omp_atomic_store (tree);
gimple gimple_build_transaction (gimple_seq, tree);
gimple gimple_build_predict (enum br_predictor, enum prediction);
! extern void gimple_seq_add_stmt (gimple_seq *, gimple);
! extern void gimple_seq_add_stmt_without_update (gimple_seq *, gimple);
void gimple_seq_add_seq (gimple_seq *, gimple_seq);
+ extern void annotate_all_with_location_after (gimple_seq, gimple_stmt_iterator,
+ location_t);
+ extern void annotate_all_with_location (gimple_seq, location_t);
+ bool empty_body_p (gimple_seq);
gimple_seq gimple_seq_copy (gimple_seq);
bool gimple_call_same_target_p (const_gimple, const_gimple);
int gimple_call_flags (const_gimple);
int gimple_call_arg_flags (const_gimple, unsigned);
! int gimple_call_return_flags (const_gimple);
bool gimple_assign_copy_p (gimple);
bool gimple_assign_ssa_name_copy_p (gimple);
bool gimple_assign_unary_nop_p (gimple);
*************** void gimple_assign_set_rhs_with_ops_1 (g
*** 808,842 ****
tree, tree, tree);
tree gimple_get_lhs (const_gimple);
void gimple_set_lhs (gimple, tree);
- void gimple_replace_lhs (gimple, tree);
gimple gimple_copy (gimple);
- gimple gimple_build_cond_from_tree (tree, tree, tree);
- void gimple_cond_set_condition_from_tree (gimple, tree);
bool gimple_has_side_effects (const_gimple);
- bool gimple_could_trap_p (gimple);
bool gimple_could_trap_p_1 (gimple, bool, bool);
bool gimple_assign_rhs_could_trap_p (gimple);
! bool empty_body_p (gimple_seq);
! extern void annotate_all_with_location_after (gimple_seq, gimple_stmt_iterator,
! location_t);
! extern void annotate_all_with_location (gimple_seq, location_t);
unsigned get_gimple_rhs_num_ops (enum tree_code);
- #define gimple_alloc(c, n) gimple_alloc_stat (c, n MEM_STAT_INFO)
- gimple gimple_alloc_stat (enum gimple_code, unsigned MEM_STAT_DECL);
-
- /* Return TRUE iff stmt is a call to a built-in function. */
- extern bool is_gimple_builtin_call (gimple stmt);
-
extern void recalculate_side_effects (tree);
extern bool gimple_compare_field_offset (tree, tree);
extern tree gimple_unsigned_type (tree);
extern tree gimple_signed_type (tree);
extern alias_set_type gimple_get_alias_set (tree);
extern bool gimple_ior_addresses_taken (bitmap, gimple);
extern bool gimple_call_builtin_p (gimple, enum built_in_class);
extern bool gimple_call_builtin_p (gimple, enum built_in_function);
extern bool gimple_asm_clobbers_memory_p (const_gimple);
! extern unsigned gimple_call_get_nobnd_arg_index (const_gimple, unsigned);
/* Formal (expression) temporary table handling: multiple occurrences of
the same scalar expression are evaluated into the same temporary. */
--- 809,839 ----
tree, tree, tree);
tree gimple_get_lhs (const_gimple);
void gimple_set_lhs (gimple, tree);
gimple gimple_copy (gimple);
bool gimple_has_side_effects (const_gimple);
bool gimple_could_trap_p_1 (gimple, bool, bool);
+ bool gimple_could_trap_p (gimple);
bool gimple_assign_rhs_could_trap_p (gimple);
! extern void dump_gimple_statistics (void);
unsigned get_gimple_rhs_num_ops (enum tree_code);
extern void recalculate_side_effects (tree);
+ extern tree canonicalize_cond_expr_cond (tree);
+ gimple gimple_call_copy_skip_args (gimple, bitmap);
extern bool gimple_compare_field_offset (tree, tree);
extern tree gimple_unsigned_type (tree);
extern tree gimple_signed_type (tree);
extern alias_set_type gimple_get_alias_set (tree);
extern bool gimple_ior_addresses_taken (bitmap, gimple);
+ extern bool is_gimple_builtin_call (gimple stmt);
extern bool gimple_call_builtin_p (gimple, enum built_in_class);
extern bool gimple_call_builtin_p (gimple, enum built_in_function);
extern bool gimple_asm_clobbers_memory_p (const_gimple);
! extern void dump_decl_set (FILE *, bitmap);
! extern bool nonfreeing_call_p (gimple);
! extern bool infer_nonnull_range (gimple, tree);
! extern void sort_case_labels (vec<tree> );
! extern void preprocess_case_label_vec_for_gimple (vec<tree> , tree, tree *);
! extern void gimple_seq_set_location (gimple_seq , location_t);
/* Formal (expression) temporary table handling: multiple occurrences of
the same scalar expression are evaluated into the same temporary. */
*************** inc_gimple_stmt_max_uid (struct function
*** 868,894 ****
return fn->last_stmt_uid++;
}
- /* Miscellaneous helpers. */
- extern tree canonicalize_cond_expr_cond (tree);
- extern void dump_decl_set (FILE *, bitmap);
- extern bool nonfreeing_call_p (gimple);
- extern bool infer_nonnull_range (gimple, tree);
-
- /* In trans-mem.c. */
- extern void diagnose_tm_safe_errors (tree);
- extern void compute_transaction_bits (void);
- extern bool is_tm_ending (gimple);
-
- /* In tree-nested.c. */
- extern void lower_nested_functions (tree);
- extern void insert_field_into_struct (tree, tree);
-
- /* In cfgexpand.c. */
- extern tree gimple_assign_rhs_to_tree (gimple);
-
- /* In builtins.c */
- extern bool validate_gimple_arglist (const_gimple, ...);
-
/* Return the first node in GIMPLE sequence S. */
static inline gimple_seq_node
--- 865,870 ----
*************** gimple_seq_empty_p (gimple_seq s)
*** 953,961 ****
return s == NULL;
}
- extern void gimple_seq_add_stmt (gimple_seq *, gimple);
- extern void gimple_seq_add_stmt_without_update (gimple_seq *, gimple);
-
/* Allocate a new sequence and initialize its first element with STMT. */
static inline gimple_seq
--- 929,934 ----
*************** gimple_expr_type (const_gimple stmt)
*** 5122,5129 ****
return void_type_node;
}
- gimple gimple_call_copy_skip_args (gimple, bitmap);
-
/* Enum and arrays used for allocation stats. Keep in sync with
gimple.c:gimple_alloc_kind_names. */
enum gimple_alloc_kind
--- 5095,5100 ----
*************** gimple_alloc_kind (enum gimple_code code
*** 5155,5162 ****
}
}
- extern void dump_gimple_statistics (void);
-
/* Return true if a location should not be emitted for this statement
by annotate_all_with_location. */
--- 5126,5131 ----
*************** gimple_set_do_not_emit_location (gimple
*** 5189,5196 ****
#define PERCENT(x,y) ((float)(x) * 100.0 / (float)(y))
- extern void sort_case_labels (vec<tree> );
- extern void preprocess_case_label_vec_for_gimple (vec<tree> , tree, tree *);
- extern void gimple_seq_set_location (gimple_seq , location_t);
-
#endif /* GCC_GIMPLE_H */
--- 5158,5161 ----
Index: gimple.c
===================================================================
*** gimple.c (revision 204833)
--- gimple.c (working copy)
*************** static const char * const gimple_alloc_k
*** 84,94 ****
"everything else"
};
- /* Private API manipulation functions shared only with some
- other files. */
- extern void gimple_set_stored_syms (gimple, bitmap, bitmap_obstack *);
- extern void gimple_set_loaded_syms (gimple, bitmap, bitmap_obstack *);
-
/* Gimple tuple constructors.
Note: Any constructor taking a ``gimple_seq'' as a parameter, can
be passed a NULL to start with an empty sequence. */
--- 84,89 ----
*************** const unsigned char gimple_rhs_class_tab
*** 1958,1991 ****
#undef DEFTREECODE
#undef END_OF_BASE_TREE_CODES
- /* Given a memory reference expression T, return its base address.
- The base address of a memory reference expression is the main
- object being referenced. For instance, the base address for
- 'array[i].fld[j]' is 'array'. You can think of this as stripping
- away the offset part from a memory address.
-
- This function calls handled_component_p to strip away all the inner
- parts of the memory reference until it reaches the base object. */
-
- tree
- get_base_address (tree t)
- {
- while (handled_component_p (t))
- t = TREE_OPERAND (t, 0);
-
- if ((TREE_CODE (t) == MEM_REF
- || TREE_CODE (t) == TARGET_MEM_REF)
- && TREE_CODE (TREE_OPERAND (t, 0)) == ADDR_EXPR)
- t = TREE_OPERAND (TREE_OPERAND (t, 0), 0);
-
- /* ??? Either the alias oracle or all callers need to properly deal
- with WITH_SIZE_EXPRs before we can look through those. */
- if (TREE_CODE (t) == WITH_SIZE_EXPR)
- return NULL_TREE;
-
- return t;
- }
-
void
recalculate_side_effects (tree t)
{
--- 1953,1958 ----
Index: tree.c
===================================================================
*** tree.c (revision 204833)
--- tree.c (working copy)
*************** drop_tree_overflow (tree t)
*** 12267,12270 ****
--- 12267,12298 ----
return t;
}
+ /* Given a memory reference expression T, return its base address.
+ The base address of a memory reference expression is the main
+ object being referenced. For instance, the base address for
+ 'array[i].fld[j]' is 'array'. You can think of this as stripping
+ away the offset part from a memory address.
+
+ This function calls handled_component_p to strip away all the inner
+ parts of the memory reference until it reaches the base object. */
+
+ tree
+ get_base_address (tree t)
+ {
+ while (handled_component_p (t))
+ t = TREE_OPERAND (t, 0);
+
+ if ((TREE_CODE (t) == MEM_REF
+ || TREE_CODE (t) == TARGET_MEM_REF)
+ && TREE_CODE (TREE_OPERAND (t, 0)) == ADDR_EXPR)
+ t = TREE_OPERAND (TREE_OPERAND (t, 0), 0);
+
+ /* ??? Either the alias oracle or all callers need to properly deal
+ with WITH_SIZE_EXPRs before we can look through those. */
+ if (TREE_CODE (t) == WITH_SIZE_EXPR)
+ return NULL_TREE;
+
+ return t;
+ }
+
#include "gt-tree.h"
Index: builtins.h
===================================================================
*** builtins.h (revision 204833)
--- builtins.h (working copy)
*************** extern struct target_builtins *this_targ
*** 44,47 ****
--- 44,49 ----
#define this_target_builtins (&default_target_builtins)
#endif
+ extern bool validate_gimple_arglist (const_gimple, ...);
+
#endif
Index: trans-mem.h
===================================================================
*** trans-mem.h (revision 204833)
--- trans-mem.h (working copy)
***************
*** 34,36 ****
--- 34,39 ----
#define PR_EXCEPTIONBLOCK 0x1000
#define PR_HASELSE 0x2000
#define PR_READONLY 0x4000
+
+ extern void compute_transaction_bits (void);
+ extern bool is_tm_ending (gimple);
Index: cfgexpand.h
===================================================================
*** cfgexpand.h (revision 0)
--- cfgexpand.h (working copy)
***************
*** 0 ****
--- 1,26 ----
+ /* Header file for lowering trees to RTL.
+ Copyright (C) 2013 Free Software Foundation, Inc.
+
+ This file is part of GCC.
+
+ GCC is free software; you can redistribute it and/or modify it under
+ the terms of the GNU General Public License as published by the Free
+ Software Foundation; either version 3, or (at your option) any later
+ version.
+
+ GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ 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/>. */
+
+ #ifndef GCC_CFGEXPAND_H
+ #define GCC_CFGEXPAND_H
+
+ extern tree gimple_assign_rhs_to_tree (gimple);
+ extern HOST_WIDE_INT estimated_stack_frame_size (struct cgraph_node *);
+
+ #endif /* GCC_CFGEXPAND_H */
Index: tree.h
===================================================================
*** tree.h (revision 204833)
--- tree.h (working copy)
*************** extern bool using_eh_for_cleanups_p (voi
*** 4597,4605 ****
extern const char *get_tree_code_name (enum tree_code);
- /* In tree-nested.c */
- extern tree build_addr (tree, tree);
-
/* In function.c */
extern void expand_function_end (void);
extern void expand_function_start (tree);
--- 4597,4602 ----
Index: tree-nested.h
===================================================================
*** tree-nested.h (revision 0)
--- tree-nested.h (working copy)
***************
*** 0 ****
--- 1,27 ----
+ /* Header file for Nested function decomposition for GIMPLE.
+ Copyright (C) 2013 Free Software Foundation, Inc.
+
+ This file is part of GCC.
+
+ GCC is free software; you can redistribute it and/or modify it under
+ the terms of the GNU General Public License as published by the Free
+ Software Foundation; either version 3, or (at your option) any later
+ version.
+
+ GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ 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/>. */
+
+ #ifndef GCC_TREE_NESTED_H
+ #define GCC_TREE_NESTED_H
+
+ extern tree build_addr (tree, tree);
+ extern void insert_field_into_struct (tree, tree);
+ extern void lower_nested_functions (tree);
+
+ #endif /* GCC_TREE_NESTED_H */
Index: tree-inline.h
===================================================================
*** tree-inline.h (revision 204833)
--- tree-inline.h (working copy)
*************** extern tree remap_decl (tree decl, copy_
*** 202,207 ****
extern tree remap_type (tree type, copy_body_data *id);
extern gimple_seq copy_gimple_seq_and_replace_locals (gimple_seq seq);
- extern HOST_WIDE_INT estimated_stack_frame_size (struct cgraph_node *);
-
#endif /* GCC_TREE_INLINE_H */
--- 202,205 ----
Index: ipa-inline-analysis.c
===================================================================
*** ipa-inline-analysis.c (revision 204833)
--- ipa-inline-analysis.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 97,102 ****
--- 97,103 ----
#include "tree-scalar-evolution.h"
#include "ipa-utils.h"
#include "cilk.h"
+ #include "cfgexpand.h"
/* Estimate runtime of function can easilly run into huge numbers with many
nested loops. Be sure we can compute time * INLINE_SIZE_SCALE * 2 in an
Index: cgraphunit.c
===================================================================
*** cgraphunit.c (revision 204833)
--- cgraphunit.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 201,206 ****
--- 201,207 ----
#include "regset.h" /* FIXME: For reg_obstack. */
#include "context.h"
#include "pass_manager.h"
+ #include "tree-nested.h"
/* Queue of cgraph nodes scheduled to be added into cgraph. This is a
secondary queue used during optimization to accommodate passes that
Index: omp-low.c
===================================================================
*** omp-low.c (revision 204833)
--- omp-low.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 58,63 ****
--- 58,64 ----
#include "omp-low.h"
#include "gimple-low.h"
#include "tree-cfgcleanup.h"
+ #include "tree-nested.h"
/* Lowering of OpenMP parallel and workshare constructs proceeds in two
Index: tree-parloops.c
===================================================================
*** tree-parloops.c (revision 204833)
--- tree-parloops.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 48,53 ****
--- 48,54 ----
#include "tree-hasher.h"
#include "tree-parloops.h"
#include "omp-low.h"
+ #include "tree-nested.h"
/* This pass tries to distribute iterations of loops into several threads.
The implementation is straightforward -- for each loop we test whether its
Index: gimple-low.c
===================================================================
*** gimple-low.c (revision 204833)
--- gimple-low.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 33,38 ****
--- 33,39 ----
#include "tree-pass.h"
#include "langhooks.h"
#include "gimple-low.h"
+ #include "tree-nested.h"
/* The differences between High GIMPLE and Low GIMPLE are the
following:
Index: tree-profile.c
===================================================================
*** tree-profile.c (revision 204833)
--- tree-profile.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 48,53 ****
--- 48,54 ----
#include "profile.h"
#include "target.h"
#include "tree-cfgcleanup.h"
+ #include "tree-nested.h"
static GTY(()) tree gcov_type_node;
static GTY(()) tree tree_interval_profiler_fn;
Index: expr.c
===================================================================
*** expr.c (revision 204833)
--- expr.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 57,62 ****
--- 57,63 ----
#include "target-globals.h"
#include "params.h"
#include "tree-ssa-address.h"
+ #include "cfgexpand.h"
/* Decide whether a function's arguments should be processed
from first to last or from last to first.
Index: tree-affine.c
===================================================================
*** tree-affine.c (revision 204833)
--- tree-affine.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 28,33 ****
--- 28,34 ----
#include "gimplify.h"
#include "flags.h"
#include "dumpfile.h"
+ #include "cfgexpand.h"
/* Extends CST as appropriate for the affine combinations COMB. */
Index: tree-ssa.c
===================================================================
*** tree-ssa.c (revision 204833)
--- tree-ssa.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 47,52 ****
--- 47,53 ----
#include "tree-pass.h"
#include "diagnostic-core.h"
#include "cfgloop.h"
+ #include "cfgexpand.h"
/* Pointer map of variable mappings, keyed by edge. */
static struct pointer_map_t *edge_var_maps;
Index: tree-ssa-loop-im.c
===================================================================
*** tree-ssa-loop-im.c (revision 204833)
--- tree-ssa-loop-im.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 46,51 ****
--- 46,52 ----
#include "tree-affine.h"
#include "pointer-set.h"
#include "tree-ssa-propagate.h"
+ #include "trans-mem.h"
/* TODO: Support for predicated code motion. I.e.
Index: tree-ssa-tail-merge.c
===================================================================
*** tree-ssa-tail-merge.c (revision 204833)
--- tree-ssa-tail-merge.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 209,214 ****
--- 209,215 ----
#include "tree-dump.h"
#include "cfgloop.h"
#include "tree-pass.h"
+ #include "trans-mem.h"
/* Describes a group of bbs with the same successors. The successor bbs are
cached in succs, and the successor edge flags are cached in succ_flags.
Index: value-prof.c
===================================================================
*** value-prof.c (revision 204833)
--- value-prof.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 51,56 ****
--- 51,58 ----
#include "pointer-set.h"
#include "profile.h"
#include "data-streamer.h"
+ #include "builtins.h"
+ #include "tree-nested.h"
/* In this file value profile based optimizations are placed. Currently the
following optimizations are implemented (for more detailed descriptions
Index: fortran/trans-intrinsic.c
===================================================================
*** fortran/trans-intrinsic.c (revision 204833)
--- fortran/trans-intrinsic.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 39,44 ****
--- 39,45 ----
#include "trans-array.h"
/* Only for gfc_trans_assign and gfc_trans_pointer_assign. */
#include "trans-stmt.h"
+ #include "tree-nested.h"
/* This maps Fortran intrinsic math functions to external library or GCC
builtin functions. */