This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[tree-profiling] Drop random noise relative to mainline
- From: Jan Hubicka <jh at suse dot cz>
- To: gcc-patches at gcc dot gnu dot org
- Date: Sat, 16 Apr 2005 14:07:14 +0200
- Subject: [tree-profiling] Drop random noise relative to mainline
Hi,
this patch address some of problems from cfg inliner patch and fixes
other random mess we accumulated in order to make merging easier.
Bootstrapped/regtested i686-pc-gnu-linux/committed.
Honza
2005-04-16 Jan Hubicka <jh@suse.cz>
* bitmap.h: Synchronize with mainline
* cfganal.c: Synchronize with mainline.
* cfgcleanup.c: Synchronize with mainline.
* cfgexpand.c: Synchronize with mainline.
* cfghooks.c: Synchronize with mainline.
* cfgloop.c: Synchronize with mainline.
* cfgloopanal.c: Synchronize with mainline.
* cfgloopmanip.c: Synchronize with mainline.
* conflict.c: Synchronize with mainline.
* dominance.c: Synchronize with mainline.
* except.c: Synchronize with mainline.
* expr.c: Synchronize with mainline.
* final.c: Synchronize with mainline.
* gimple-low.c: Synchronize with mainline.
* gimplify.c: Synchronize with mainline.
* loop-doloop.c: Synchronize with mainline.
* loop-init.c: Synchronize with mainline.
* loop-iv.c: Synchronize with mainline.
* loop-unroll.c: Synchronize with mainline.
* loop-unswitch.c: Synchronize with mainline.
* parms.def: Synchronize with mainline.
* passes.c: Synchronize with mainline.
* predict.c: Synchronize with mainline.
* sched-rgn.c: Synchronize with mainline.
* tracer.c: Synchronize with mainline.
* tree-cfg.c: (build_tree_cfg): Make local again; do not re-allocate
entry/exit block.
(cleanup_control_flow): Make local again.
* tree-dfa.c: Synchronize with mainline.
* tree-flow-inline.h: Synchronize with mainline.
* tree-flow.h: (build_tree_cfg): Drop prototype.
* tree-phinodes.c: Synchronize with mainline.
* tree-sra.c: Synchronize with mainline.
* tree-ssa-ccp.c: Synchronize with mainline.
* tree-ssa-dce.c: Synchronize with mainline.
* tree-ssa-dse.c: Synchronize with mainline.
* tree-ssa-flowprop.c: Synchronize with mainline.
* tree-ssa-phiopt.c: Synchronize with mainline.
* tree-ssa-pre.c: Synchronize with mainline.
* tree.c: Synchronize with mainline.
* tree.h: (lower_function_body): Drop prototype.
* var-tracking.c: Synchronize with mainline.
Index: bitmap.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/bitmap.h,v
retrieving revision 1.28.2.4.2.4
diff -c -3 -p -r1.28.2.4.2.4 bitmap.h
*** bitmap.h 1 Mar 2005 23:07:24 -0000 1.28.2.4.2.4
--- bitmap.h 15 Apr 2005 22:58:52 -0000
*************** extern bitmap_obstack bitmap_default_obs
*** 80,86 ****
/* Clear a bitmap by freeing up the linked list. */
extern void bitmap_clear (bitmap);
! /* Copy the second bitmap to the first bitmap. */
extern void bitmap_copy (bitmap, bitmap);
/* True if two bitmaps are identical. */
--- 80,86 ----
/* Clear a bitmap by freeing up the linked list. */
extern void bitmap_clear (bitmap);
! /* Copy a bitmap to another bitmap. */
extern void bitmap_copy (bitmap, bitmap);
/* True if two bitmaps are identical. */
Index: cfganal.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cfganal.c,v
retrieving revision 1.25.2.13.2.9
diff -c -3 -p -r1.25.2.13.2.9 cfganal.c
*** cfganal.c 17 Mar 2005 22:21:49 -0000 1.25.2.13.2.9
--- cfganal.c 15 Apr 2005 22:58:52 -0000
*************** Software Foundation, 59 Temple Place - S
*** 28,34 ****
#include "obstack.h"
#include "hard-reg-set.h"
#include "basic-block.h"
- #include "function.h"
#include "insn-config.h"
#include "recog.h"
#include "toplev.h"
--- 28,33 ----
Index: cfgcleanup.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cfgcleanup.c,v
retrieving revision 1.62.2.21.2.19
diff -c -3 -p -r1.62.2.21.2.19 cfgcleanup.c
*** cfgcleanup.c 4 Apr 2005 11:38:40 -0000 1.62.2.21.2.19
--- cfgcleanup.c 15 Apr 2005 22:58:52 -0000
*************** Software Foundation, 59 Temple Place - S
*** 37,45 ****
#include "tm.h"
#include "rtl.h"
#include "hard-reg-set.h"
- #include "obstack.h"
- #include "basic-block.h"
- #include "function.h"
#include "regs.h"
#include "timevar.h"
#include "output.h"
--- 37,42 ----
Index: cfgexpand.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cfgexpand.c,v
retrieving revision 1.1.2.27
diff -c -3 -p -r1.1.2.27 cfgexpand.c
*** cfgexpand.c 17 Mar 2005 22:21:50 -0000 1.1.2.27
--- cfgexpand.c 15 Apr 2005 22:58:52 -0000
*************** failed:
*** 81,86 ****
--- 81,87 ----
fprintf (dump_file, "Failed to add probability note\n");
}
+
#ifndef LOCAL_ALIGNMENT
#define LOCAL_ALIGNMENT(TYPE, ALIGNMENT) ALIGNMENT
#endif
Index: cfghooks.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cfghooks.c,v
retrieving revision 1.1.2.10.2.11
diff -c -3 -p -r1.1.2.10.2.11 cfghooks.c
*** cfghooks.c 9 Apr 2005 01:28:51 -0000 1.1.2.10.2.11
--- cfghooks.c 15 Apr 2005 22:58:52 -0000
*************** Boston, MA 02111-1307, USA. */
*** 26,32 ****
#include "tree.h"
#include "rtl.h"
#include "basic-block.h"
- #include "function.h"
#include "tree-flow.h"
#include "timevar.h"
#include "toplev.h"
--- 26,31 ----
Index: cfgloop.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cfgloop.c,v
retrieving revision 1.14.2.14.2.10
diff -c -3 -p -r1.14.2.14.2.10 cfgloop.c
*** cfgloop.c 17 Mar 2005 22:21:52 -0000 1.14.2.14.2.10
--- cfgloop.c 15 Apr 2005 22:58:52 -0000
*************** Software Foundation, 59 Temple Place - S
*** 27,33 ****
#include "obstack.h"
#include "function.h"
#include "basic-block.h"
- #include "function.h"
#include "toplev.h"
#include "cfgloop.h"
#include "flags.h"
--- 27,32 ----
Index: cfgloopanal.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cfgloopanal.c,v
retrieving revision 1.2.4.10.2.12
diff -c -3 -p -r1.2.4.10.2.12 cfgloopanal.c
*** cfgloopanal.c 4 Apr 2005 11:38:41 -0000 1.2.4.10.2.12
--- cfgloopanal.c 15 Apr 2005 22:58:52 -0000
*************** Software Foundation, 59 Temple Place - S
*** 26,32 ****
#include "hard-reg-set.h"
#include "obstack.h"
#include "basic-block.h"
- #include "function.h"
#include "cfgloop.h"
#include "expr.h"
#include "output.h"
--- 26,31 ----
Index: cfgloopmanip.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cfgloopmanip.c,v
retrieving revision 1.3.2.14.2.14
diff -c -3 -p -r1.3.2.14.2.14 cfgloopmanip.c
*** cfgloopmanip.c 9 Apr 2005 01:28:52 -0000 1.3.2.14.2.14
--- cfgloopmanip.c 15 Apr 2005 22:58:52 -0000
*************** Software Foundation, 59 Temple Place - S
*** 26,32 ****
#include "hard-reg-set.h"
#include "obstack.h"
#include "basic-block.h"
- #include "function.h"
#include "cfgloop.h"
#include "cfglayout.h"
#include "cfghooks.h"
--- 26,31 ----
Index: conflict.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/conflict.c,v
retrieving revision 1.14.2.8.2.8
diff -c -3 -p -r1.14.2.8.2.8 conflict.c
*** conflict.c 17 Mar 2005 22:22:31 -0000 1.14.2.8.2.8
--- conflict.c 15 Apr 2005 22:58:52 -0000
*************** Software Foundation, 59 Temple Place - S
*** 34,40 ****
#include "rtl.h"
#include "hard-reg-set.h"
#include "basic-block.h"
- #include "function.h"
/* A register conflict graph is an undirected graph containing nodes
for some or all of the regs used in a function. Arcs represent
--- 34,39 ----
Index: dominance.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/dominance.c,v
retrieving revision 1.10.2.14.2.12
diff -c -3 -p -r1.10.2.14.2.12 dominance.c
*** dominance.c 15 Apr 2005 13:26:24 -0000 1.10.2.14.2.12
--- dominance.c 15 Apr 2005 22:58:52 -0000
***************
*** 41,47 ****
#include "hard-reg-set.h"
#include "obstack.h"
#include "basic-block.h"
- #include "function.h"
#include "errors.h"
#include "et-forest.h"
--- 41,46 ----
Index: except.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/except.c,v
retrieving revision 1.227.2.24.2.17
diff -c -3 -p -r1.227.2.24.2.17 except.c
*** except.c 4 Apr 2005 11:39:32 -0000 1.227.2.24.2.17
--- except.c 15 Apr 2005 22:58:52 -0000
*************** Software Foundation, 59 Temple Place - S
*** 73,79 ****
#include "tm_p.h"
#include "target.h"
#include "langhooks.h"
- #include "tree-iterator.h"
#include "cgraph.h"
#include "tree-inline.h"
#include "tree-flow.h"
--- 73,78 ----
*************** Software Foundation, 59 Temple Place - S
*** 84,89 ****
--- 83,89 ----
#define EH_RETURN_DATA_REGNO(N) INVALID_REGNUM
#endif
+
/* Protect cleanup actions with must-not-throw regions, with a call
to the given failure handler. */
tree (*lang_protect_cleanup_actions) (void);
Index: expr.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/expr.c,v
retrieving revision 1.467.2.76.2.25
diff -c -3 -p -r1.467.2.76.2.25 expr.c
*** expr.c 4 Apr 2005 11:39:34 -0000 1.467.2.76.2.25
--- expr.c 15 Apr 2005 22:58:53 -0000
*************** get_inner_reference (tree exp, HOST_WIDE
*** 5447,5452 ****
--- 5447,5453 ----
/* ??? Right now we don't do anything with DECL_OFFSET_ALIGN. */
}
break;
+
case ARRAY_REF:
case ARRAY_RANGE_REF:
{
Index: final.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/final.c,v
retrieving revision 1.262.2.23.2.15
diff -c -3 -p -r1.262.2.23.2.15 final.c
*** final.c 4 Apr 2005 11:39:37 -0000 1.262.2.23.2.15
--- final.c 15 Apr 2005 22:58:53 -0000
*************** final_scan_insn (rtx insn, FILE *file, i
*** 1962,1972 ****
else
current_function_section (current_function_decl);
- if (! JUMP_TABLES_IN_TEXT_SECTION)
- targetm.asm_out.function_rodata_section (current_function_decl);
- else
- function_section (current_function_decl);
-
if (app_on)
{
fputs (ASM_APP_OFF, file);
--- 1962,1967 ----
Index: gimple-low.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/gimple-low.c,v
retrieving revision 1.1.4.17.2.15
diff -c -3 -p -r1.1.4.17.2.15 gimple-low.c
*** gimple-low.c 17 Mar 2005 22:23:16 -0000 1.1.4.17.2.15
--- gimple-low.c 15 Apr 2005 22:58:53 -0000
*************** Software Foundation, 59 Temple Place - S
*** 42,47 ****
--- 42,48 ----
#include "toplev.h"
#include "tree-pass.h"
#include "pointer-set.h"
+
struct lower_data
{
/* Block the current statement belongs to. */
*************** static bool expand_var_p (tree);
*** 60,66 ****
/* Lowers the body of current_function_decl. */
! void
lower_function_body (void)
{
struct lower_data data;
--- 61,67 ----
/* Lowers the body of current_function_decl. */
! static void
lower_function_body (void)
{
struct lower_data data;
*************** lower_function_body (void)
*** 69,78 ****
tree_stmt_iterator i;
tree t, x;
- /* If already lowered, do nothing. */
- if (TREE_CODE (bind) == STATEMENT_LIST)
- return;
-
gcc_assert (TREE_CODE (bind) == BIND_EXPR);
data.block = DECL_INITIAL (current_function_decl);
--- 70,75 ----
Index: gimplify.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/gimplify.c,v
retrieving revision 1.1.2.141.2.25
diff -c -3 -p -r1.1.2.141.2.25 gimplify.c
*** gimplify.c 4 Apr 2005 11:39:57 -0000 1.1.2.141.2.25
--- gimplify.c 15 Apr 2005 22:58:53 -0000
*************** gimplify_expr (tree *expr_p, tree *pre_p
*** 4003,4008 ****
--- 4003,4009 ----
ret = gimplify_expr (&GOTO_DESTINATION (*expr_p), pre_p,
NULL, is_gimple_val, fb_rvalue);
break;
+
case LABEL_EXPR:
ret = GS_ALL_DONE;
gcc_assert (decl_function_context (LABEL_EXPR_LABEL (*expr_p))
Index: loop-doloop.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/loop-doloop.c,v
retrieving revision 2.2.4.7
diff -c -3 -p -r2.2.4.7 loop-doloop.c
*** loop-doloop.c 4 Apr 2005 11:40:04 -0000 2.2.4.7
--- loop-doloop.c 15 Apr 2005 22:58:53 -0000
*************** Software Foundation, 59 Temple Place - S
*** 28,34 ****
#include "expr.h"
#include "hard-reg-set.h"
#include "basic-block.h"
- #include "function.h"
#include "toplev.h"
#include "tm_p.h"
#include "cfgloop.h"
--- 28,33 ----
Index: loop-init.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/loop-init.c,v
retrieving revision 1.2.2.8.2.6
diff -c -3 -p -r1.2.2.8.2.6 loop-init.c
*** loop-init.c 17 Mar 2005 22:23:23 -0000 1.2.2.8.2.6
--- loop-init.c 15 Apr 2005 22:58:53 -0000
*************** Software Foundation, 59 Temple Place - S
*** 26,32 ****
#include "hard-reg-set.h"
#include "obstack.h"
#include "basic-block.h"
- #include "function.h"
#include "cfgloop.h"
#include "cfglayout.h"
--- 26,31 ----
Index: loop-iv.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/loop-iv.c,v
retrieving revision 2.6.2.14
diff -c -3 -p -r2.6.2.14 loop-iv.c
*** loop-iv.c 4 Apr 2005 11:40:05 -0000 2.6.2.14
--- loop-iv.c 15 Apr 2005 22:58:54 -0000
*************** Software Foundation, 59 Temple Place - S
*** 55,61 ****
#include "hard-reg-set.h"
#include "obstack.h"
#include "basic-block.h"
- #include "function.h"
#include "cfgloop.h"
#include "expr.h"
#include "output.h"
--- 55,60 ----
Index: loop-unroll.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/loop-unroll.c,v
retrieving revision 1.2.2.6.4.8
diff -c -3 -p -r1.2.2.6.4.8 loop-unroll.c
*** loop-unroll.c 4 Apr 2005 11:40:05 -0000 1.2.2.6.4.8
--- loop-unroll.c 15 Apr 2005 22:58:54 -0000
*************** Software Foundation, 59 Temple Place - S
*** 26,32 ****
#include "hard-reg-set.h"
#include "obstack.h"
#include "basic-block.h"
- #include "function.h"
#include "cfgloop.h"
#include "cfglayout.h"
#include "params.h"
--- 26,31 ----
Index: loop-unswitch.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/loop-unswitch.c,v
retrieving revision 1.2.2.9.2.11
diff -c -3 -p -r1.2.2.9.2.11 loop-unswitch.c
*** loop-unswitch.c 4 Apr 2005 11:40:06 -0000 1.2.2.9.2.11
--- loop-unswitch.c 15 Apr 2005 22:58:54 -0000
*************** Software Foundation, 59 Temple Place - S
*** 26,32 ****
#include "hard-reg-set.h"
#include "obstack.h"
#include "basic-block.h"
- #include "function.h"
#include "cfgloop.h"
#include "cfglayout.h"
#include "params.h"
--- 26,31 ----
Index: params.def
===================================================================
RCS file: /cvs/gcc/gcc/gcc/params.def,v
retrieving revision 1.15.2.18.2.14
diff -c -3 -p -r1.15.2.18.2.14 params.def
*** params.def 15 Apr 2005 13:27:13 -0000 1.15.2.18.2.14
--- params.def 15 Apr 2005 22:58:54 -0000
*************** DEFPARAM(PARAM_INLINE_UNIT_GROWTH,
*** 166,172 ****
50, 0, 0)
DEFPARAM(PARAM_INLINE_CALL_COST,
"inline-call-cost",
! "expense of call operation relative to ordinary aritmetic operations",
16, 0, 0)
/* The GCSE optimization will be disabled if it would require
--- 166,172 ----
50, 0, 0)
DEFPARAM(PARAM_INLINE_CALL_COST,
"inline-call-cost",
! "expense of call operation relative to ordinary arithmetic operations",
16, 0, 0)
/* The GCSE optimization will be disabled if it would require
Index: passes.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/passes.c,v
retrieving revision 2.2.4.30
diff -c -3 -p -r2.2.4.30 passes.c
*** passes.c 15 Apr 2005 13:27:13 -0000 2.2.4.30
--- passes.c 15 Apr 2005 22:58:54 -0000
*************** rest_of_handle_jump (void)
*** 1225,1240 ****
timevar_push (TV_JUMP);
open_dump_file (DFI_sibling, current_function_decl);
- /* ??? We may get called either via tree_rest_of_compilation when the CFG
- is already built or directly (for instance from coverage code).
- The direct callers shall be updated. */
- if (!basic_block_info)
- {
- init_flow ();
- rebuild_jump_labels (get_insns ());
- find_exception_handler_labels ();
- find_basic_blocks (get_insns ());
- }
delete_unreachable_blocks ();
#ifdef ENABLE_CHECKING
verify_flow_info ();
--- 1225,1230 ----
Index: predict.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/predict.c,v
retrieving revision 1.71.2.18.2.28
diff -c -3 -p -r1.71.2.18.2.28 predict.c
*** predict.c 9 Apr 2005 01:29:09 -0000 1.71.2.18.2.28
--- predict.c 15 Apr 2005 22:58:54 -0000
*************** estimate_probability (struct loops *loop
*** 878,884 ****
profile_status = PROFILE_GUESSED;
}
! /* Set edge->probability for each succestor edge of BB. */
void
guess_outgoing_edge_probabilities (basic_block bb)
{
--- 878,884 ----
profile_status = PROFILE_GUESSED;
}
! /* Set edge->probability for each successor edge of BB. */
void
guess_outgoing_edge_probabilities (basic_block bb)
{
Index: sched-rgn.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/sched-rgn.c,v
retrieving revision 1.46.2.17.2.13
diff -c -3 -p -r1.46.2.17.2.13 sched-rgn.c
*** sched-rgn.c 17 Mar 2005 22:23:44 -0000 1.46.2.17.2.13
--- sched-rgn.c 15 Apr 2005 22:58:54 -0000
*************** compute_trg_info (int trg)
*** 994,1002 ****
edge_iterator ei;
edge e;
- el.nr_members = 0;
- el.first_member = 0;
-
/* Define some of the fields for the target bb as well. */
sp = candidate_table + trg;
sp->is_valid = 1;
--- 994,999 ----
Index: tracer.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tracer.c,v
retrieving revision 1.2.6.10.2.8
diff -c -3 -p -r1.2.6.10.2.8 tracer.c
*** tracer.c 17 Mar 2005 22:23:55 -0000 1.2.6.10.2.8
--- tracer.c 15 Apr 2005 22:58:54 -0000
***************
*** 41,47 ****
#include "rtl.h"
#include "hard-reg-set.h"
#include "basic-block.h"
- #include "function.h"
#include "output.h"
#include "cfglayout.h"
#include "fibheap.h"
--- 41,46 ----
Index: tree-cfg.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-cfg.c,v
retrieving revision 1.1.4.267.2.40
diff -c -3 -p -r1.1.4.267.2.40 tree-cfg.c
*** tree-cfg.c 15 Apr 2005 13:27:26 -0000 1.1.4.267.2.40
--- tree-cfg.c 15 Apr 2005 22:58:54 -0000
*************** static bool cleanup_forwarder_blocks (vo
*** 140,146 ****
/* Entry point to the CFG builder for trees. TP points to the list of
statements to be added to the flowgraph. */
! void
build_tree_cfg (tree *tp)
{
/* Register specific tree functions. */
--- 140,146 ----
/* Entry point to the CFG builder for trees. TP points to the list of
statements to be added to the flowgraph. */
! static void
build_tree_cfg (tree *tp)
{
/* Register specific tree functions. */
*************** build_tree_cfg (tree *tp)
*** 158,167 ****
VARRAY_BB_INIT (label_to_block_map, initial_cfg_capacity,
"label to block map");
- ENTRY_BLOCK_PTR = ggc_alloc_cleared (sizeof (*ENTRY_BLOCK_PTR));
- ENTRY_BLOCK_PTR->index = ENTRY_BLOCK;
- EXIT_BLOCK_PTR = ggc_alloc_cleared (sizeof (*EXIT_BLOCK_PTR));
- EXIT_BLOCK_PTR->index = EXIT_BLOCK;
ENTRY_BLOCK_PTR->next_bb = EXIT_BLOCK_PTR;
EXIT_BLOCK_PTR->prev_bb = ENTRY_BLOCK_PTR;
--- 158,163 ----
*************** VEC(tree) *modified_noreturn_calls;
*** 2158,2164 ****
/* Try to remove superfluous control structures. */
! bool
cleanup_control_flow (void)
{
basic_block bb;
--- 2154,2160 ----
/* Try to remove superfluous control structures. */
! static bool
cleanup_control_flow (void)
{
basic_block bb;
Index: tree-dfa.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-dfa.c,v
retrieving revision 1.1.4.217.2.22
diff -c -3 -p -r1.1.4.217.2.22 tree-dfa.c
*** tree-dfa.c 15 Apr 2005 13:27:30 -0000 1.1.4.217.2.22
--- tree-dfa.c 15 Apr 2005 22:58:55 -0000
*************** create_stmt_ann (tree t)
*** 190,195 ****
--- 190,196 ----
return ann;
}
+
/* Create a new annotation for a tree T. */
tree_ann_t
Index: tree-flow-inline.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-flow-inline.h,v
retrieving revision 1.1.2.66.2.16
diff -c -3 -p -r1.1.2.66.2.16 tree-flow-inline.h
*** tree-flow-inline.h 15 Apr 2005 13:27:31 -0000 1.1.2.66.2.16
--- tree-flow-inline.h 15 Apr 2005 22:58:55 -0000
*************** get_stmt_ann (tree stmt)
*** 66,71 ****
--- 66,72 ----
return (ann) ? ann : create_stmt_ann (stmt);
}
+
/* Return the annotation type for annotation ANN. */
static inline enum tree_ann_type
ann_type (tree_ann_t ann)
*************** static inline void
*** 921,930 ****
mark_call_clobbered (tree var)
{
var_ann_t ann = var_ann (var);
-
- #ifdef ENABLE_CHECKING
- gcc_assert (!is_gimple_reg (var));
- #endif
/* If VAR is a memory tag, then we need to consider it a global
variable. This is because the pointer that VAR represents has
been found to point to either an arbitrary location or to a known
--- 922,927 ----
Index: tree-flow.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-flow.h,v
retrieving revision 1.1.4.187.2.31
diff -c -3 -p -r1.1.4.187.2.31 tree-flow.h
*** tree-flow.h 15 Apr 2005 13:27:33 -0000 1.1.4.187.2.31
--- tree-flow.h 15 Apr 2005 22:58:55 -0000
*************** bool sra_type_can_be_decomposed_p (tree)
*** 509,515 ****
/* Location to track pending stmt for edge insertion. */
#define PENDING_STMT(e) ((e)->insns.t)
- extern void build_tree_cfg (tree *);
extern void delete_tree_cfg_annotations (void);
extern void disband_implicit_edges (void);
extern bool stmt_ends_bb_p (tree);
--- 509,514 ----
Index: tree-phinodes.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-phinodes.c,v
retrieving revision 1.1.2.9.2.11
diff -c -3 -p -r1.1.2.9.2.11 tree-phinodes.c
*** tree-phinodes.c 15 Apr 2005 13:27:42 -0000 1.1.2.9.2.11
--- tree-phinodes.c 15 Apr 2005 22:58:55 -0000
*************** Boston, MA 02111-1307, USA. */
*** 27,33 ****
#include "varray.h"
#include "ggc.h"
#include "basic-block.h"
- #include "function.h"
#include "tree-flow.h"
#include "toplev.h"
--- 27,32 ----
Index: tree-sra.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-sra.c,v
retrieving revision 1.1.2.20.2.21
diff -c -3 -p -r1.1.2.20.2.21 tree-sra.c
*** tree-sra.c 15 Apr 2005 13:27:46 -0000 1.1.2.20.2.21
--- tree-sra.c 15 Apr 2005 22:58:55 -0000
*************** Software Foundation, 59 Temple Place - S
*** 34,40 ****
#include "tm_p.h"
#include "hard-reg-set.h"
#include "basic-block.h"
- #include "function.h"
#include "diagnostic.h"
#include "langhooks.h"
#include "tree-inline.h"
--- 34,39 ----
Index: tree-ssa-ccp.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-ssa-ccp.c,v
retrieving revision 1.1.2.139.2.24
diff -c -3 -p -r1.1.2.139.2.24 tree-ssa-ccp.c
*** tree-ssa-ccp.c 15 Apr 2005 13:27:48 -0000 1.1.2.139.2.24
--- tree-ssa-ccp.c 15 Apr 2005 22:58:55 -0000
*************** Software Foundation, 59 Temple Place - S
*** 198,204 ****
#include "tm_p.h"
#include "ggc.h"
#include "basic-block.h"
- #include "function.h"
#include "output.h"
#include "errors.h"
#include "expr.h"
--- 198,203 ----
Index: tree-ssa-dce.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-ssa-dce.c,v
retrieving revision 1.1.2.78.2.21
diff -c -3 -p -r1.1.2.78.2.21 tree-ssa-dce.c
*** tree-ssa-dce.c 15 Apr 2005 13:27:52 -0000 1.1.2.78.2.21
--- tree-ssa-dce.c 15 Apr 2005 22:58:55 -0000
*************** Software Foundation, 59 Temple Place - S
*** 56,62 ****
#include "hard-reg-set.h"
#include "obstack.h"
#include "basic-block.h"
- #include "function.h"
#include "tree.h"
#include "diagnostic.h"
--- 56,61 ----
*************** static void find_obviously_necessary_stm
*** 126,132 ****
static void mark_control_dependent_edges_necessary (basic_block, struct edge_list *);
static void propagate_necessity (struct edge_list *);
! static bool eliminate_unnecessary_stmts (void);
static void remove_dead_phis (basic_block);
static void remove_dead_stmt (block_stmt_iterator *, basic_block);
--- 125,131 ----
static void mark_control_dependent_edges_necessary (basic_block, struct edge_list *);
static void propagate_necessity (struct edge_list *);
! static void eliminate_unnecessary_stmts (void);
static void remove_dead_phis (basic_block);
static void remove_dead_stmt (block_stmt_iterator *, basic_block);
*************** mark_really_necessary_kill_operand_phis
*** 624,635 ****
/* Eliminate unnecessary statements. Any instruction not marked as necessary
contributes nothing to the program, and can be deleted. */
! static bool
eliminate_unnecessary_stmts (void)
{
basic_block bb;
block_stmt_iterator i;
- bool modified = false;
if (dump_file && (dump_flags & TDF_DETAILS))
fprintf (dump_file, "\nEliminating unnecessary statements:\n");
--- 623,633 ----
/* Eliminate unnecessary statements. Any instruction not marked as necessary
contributes nothing to the program, and can be deleted. */
! static void
eliminate_unnecessary_stmts (void)
{
basic_block bb;
block_stmt_iterator i;
if (dump_file && (dump_flags & TDF_DETAILS))
fprintf (dump_file, "\nEliminating unnecessary statements:\n");
*************** eliminate_unnecessary_stmts (void)
*** 652,661 ****
/* If `i' is not necessary then remove it. */
if (! NECESSARY (t))
! {
! modified = true;
! remove_dead_stmt (&i, bb);
! }
else
{
tree call = get_call_expr_in (t);
--- 650,656 ----
/* If `i' is not necessary then remove it. */
if (! NECESSARY (t))
! remove_dead_stmt (&i, bb);
else
{
tree call = get_call_expr_in (t);
*************** eliminate_unnecessary_stmts (void)
*** 665,672 ****
}
}
}
! return modified;
! }
/* Remove dead PHI nodes from block BB. */
--- 660,666 ----
}
}
}
! }
/* Remove dead PHI nodes from block BB. */
*************** static void
*** 878,884 ****
perform_tree_ssa_dce (bool aggressive)
{
struct edge_list *el = NULL;
- bool modified;
tree_dce_init (aggressive);
--- 872,877 ----
*************** perform_tree_ssa_dce (bool aggressive)
*** 902,908 ****
propagate_necessity (el);
mark_really_necessary_kill_operand_phis ();
! modified = eliminate_unnecessary_stmts ();
if (aggressive)
free_dominance_info (CDI_POST_DOMINATORS);
--- 895,901 ----
propagate_necessity (el);
mark_really_necessary_kill_operand_phis ();
! eliminate_unnecessary_stmts ();
if (aggressive)
free_dominance_info (CDI_POST_DOMINATORS);
*************** perform_tree_ssa_dce (bool aggressive)
*** 913,923 ****
tree_dce_done (aggressive);
- /* Fixing def-def chains needs to build dominance tree that requires
- all basic blocks reachable. */
- if (aggressive && modified)
- delete_unreachable_blocks ();
-
free_edge_list (el);
}
--- 906,911 ----
Index: tree-ssa-dse.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-ssa-dse.c,v
retrieving revision 1.1.4.14
diff -c -3 -p -r1.1.4.14 tree-ssa-dse.c
*** tree-ssa-dse.c 15 Apr 2005 13:27:55 -0000 1.1.4.14
--- tree-ssa-dse.c 15 Apr 2005 22:58:55 -0000
*************** Boston, MA 02111-1307, USA. */
*** 28,34 ****
#include "rtl.h"
#include "tm_p.h"
#include "basic-block.h"
- #include "function.h"
#include "timevar.h"
#include "diagnostic.h"
#include "tree-flow.h"
--- 28,33 ----
Index: tree-ssa-forwprop.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-ssa-forwprop.c,v
retrieving revision 1.1.2.1.2.15
diff -c -3 -p -r1.1.2.1.2.15 tree-ssa-forwprop.c
*** tree-ssa-forwprop.c 9 Apr 2005 01:29:37 -0000 1.1.2.1.2.15
--- tree-ssa-forwprop.c 15 Apr 2005 22:58:55 -0000
*************** Boston, MA 02111-1307, USA. */
*** 28,34 ****
#include "rtl.h"
#include "tm_p.h"
#include "basic-block.h"
- #include "function.h"
#include "timevar.h"
#include "diagnostic.h"
#include "tree-flow.h"
--- 28,33 ----
Index: tree-ssa-phiopt.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-ssa-phiopt.c,v
retrieving revision 1.1.2.1.2.19
diff -c -3 -p -r1.1.2.1.2.19 tree-ssa-phiopt.c
*** tree-ssa-phiopt.c 15 Apr 2005 13:28:02 -0000 1.1.2.1.2.19
--- tree-ssa-phiopt.c 15 Apr 2005 22:58:55 -0000
*************** Software Foundation, 59 Temple Place - S
*** 29,35 ****
#include "flags.h"
#include "tm_p.h"
#include "basic-block.h"
- #include "function.h"
#include "timevar.h"
#include "diagnostic.h"
#include "tree-flow.h"
--- 29,34 ----
Index: tree-ssa-pre.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree-ssa-pre.c,v
retrieving revision 1.1.4.129.2.23
diff -c -3 -p -r1.1.4.129.2.23 tree-ssa-pre.c
*** tree-ssa-pre.c 15 Apr 2005 13:28:02 -0000 1.1.4.129.2.23
--- tree-ssa-pre.c 15 Apr 2005 22:58:55 -0000
*************** Boston, MA 02111-1307, USA. */
*** 28,34 ****
#include "ggc.h"
#include "tree.h"
#include "basic-block.h"
- #include "function.h"
#include "diagnostic.h"
#include "tree-inline.h"
#include "tree-flow.h"
--- 28,33 ----
Index: tree.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree.c,v
retrieving revision 1.263.2.80.2.22
diff -c -3 -p -r1.263.2.80.2.22 tree.c
*** tree.c 4 Apr 2005 11:40:56 -0000 1.263.2.80.2.22
--- tree.c 15 Apr 2005 22:58:56 -0000
*************** build4_stat (enum tree_code code, tree t
*** 2704,2710 ****
return t;
}
-
/* Backup definition for non-gcc build compilers. */
tree
--- 2704,2709 ----
Index: tree.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/tree.h,v
retrieving revision 1.342.2.169.2.30
diff -c -3 -p -r1.342.2.169.2.30 tree.h
*** tree.h 15 Apr 2005 13:28:17 -0000 1.342.2.169.2.30
--- tree.h 15 Apr 2005 22:58:56 -0000
*************** extern const char *get_name (tree);
*** 3812,3820 ****
extern tree unshare_expr (tree);
extern void sort_case_labels (tree);
- /* In gimple-low.c */
- void lower_function_body (void);
-
/* In tree-eh.c */
void duplicate_stmt_eh_region_mapping (struct function *,
struct function *, tree, tree, bool);
--- 3812,3817 ----
Index: var-tracking.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/var-tracking.c,v
retrieving revision 2.4.2.1.2.10
diff -c -3 -p -r2.4.2.1.2.10 var-tracking.c
*** var-tracking.c 17 Mar 2005 22:24:30 -0000 2.4.2.1.2.10
--- var-tracking.c 15 Apr 2005 22:58:56 -0000
***************
*** 93,99 ****
#include "rtl.h"
#include "tree.h"
#include "hard-reg-set.h"
- #include "function.h"
#include "basic-block.h"
#include "flags.h"
#include "output.h"
--- 93,98 ----