merge from mainline at tag bounded-pointers-merge-20000914

git-svn-id: https://gcc.gnu.org/svn/gcc/branches/bounded-pointers-branch@36425 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 22 insertions, 1 deletions

diff --git a/gcc/basic-block.h b/gcc/basic-block.h
index 7e11ed5e5ec..b04352fc8ea 100644
--- a/gcc/basic-block.h
+++ b/gcc/basic-block.h
@@ -235,11 +235,13 @@ extern varray_type basic_block_for_insn;
 #define BLOCK_NUM(INSN)	      (BLOCK_FOR_INSN (INSN)->index + 0)
 
 extern void compute_bb_for_insn		PARAMS ((int));
+extern void update_bb_for_insn		PARAMS ((basic_block));
 extern void set_block_for_insn		PARAMS ((rtx, basic_block));
 extern void set_block_num		PARAMS ((rtx, int));
 
 extern void free_basic_block_vars	PARAMS ((int));
 
+extern edge split_block			PARAMS ((basic_block, rtx));
 extern basic_block split_edge		PARAMS ((edge));
 extern void insert_insn_on_edge		PARAMS ((rtx, edge));
 extern void commit_edge_insertions	PARAMS ((void));
@@ -274,6 +276,12 @@ struct loop
   /* Basic block of loop pre-header or NULL if it does not exist.  */
   basic_block pre_header;
 
+  /* Root node of pre_header extended basic block.  */
+  basic_block pre_header_root;
+
+  /* Bitmap of blocks of trace from pre_header root to pre_header.  */
+  sbitmap pre_header_trace;
+
   /* The first block in the loop.  This is not necessarily the same as
      the loop header.  */
   basic_block first;
@@ -300,6 +308,9 @@ struct loop
   /* Number of edges that exit the loop.  */
   int num_exits;
 
+  /* Bitmap of blocks that dominate all exits of the loop.  */
+  sbitmap exits_doms;
+
   /* The loop nesting depth.  */
   int depth;
 
@@ -402,7 +413,8 @@ struct loops
   sbitmap shared_headers;
 };
 
-extern int flow_loops_find PARAMS ((struct loops *));
+extern int flow_loops_find PARAMS ((struct loops *, int flags));
+extern int flow_loops_update PARAMS ((struct loops *, int flags));
 extern void flow_loops_free PARAMS ((struct loops *));
 extern void flow_loops_dump PARAMS ((const struct loops *, FILE *,
 				     void (*)(const struct loop *,
@@ -466,6 +478,15 @@ enum update_life_extent
 #define PROP_AUTOINC		32	/* Create autoinc mem references.  */
 #define PROP_FINAL		63	/* All of the above.  */
 
+
+/* Flags for loop discovery.  */
+
+#define LOOP_TREE		1 	/* Build loop hierarchy tree.  */
+#define LOOP_PRE_HEADER		2	/* Analyse loop pre-header.  */
+#define LOOP_EDGES		4 	/* Find entry and exit edges.  */
+#define LOOP_EXITS_DOMS		8 	/* Find nodes that dom. all exits.  */
+#define LOOP_ALL	       15 	/* All of the above  */
+
 extern void life_analysis	PARAMS ((rtx, FILE *, int));
 extern void update_life_info	PARAMS ((sbitmap, enum update_life_extent,
 					 int));