--- a/gcc/tree-data-ref.h	Sun Feb 07 18:28:00 2010 +0900
+++ b/gcc/tree-data-ref.h	Fri Feb 12 23:39:51 2010 +0900
@@ -1,4 +1,4 @@
-/* Data references and dependences detectors. 
+/* Data references and dependences detectors.
    Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009
    Free Software Foundation, Inc.
    Contributed by Sebastian Pop <pop@cri.ensmp.fr>
@@ -32,14 +32,14 @@
   reference in the innermost enclosing loop.  The address is expressed as
   BASE + STEP * # of iteration, and base is further decomposed as the base
   pointer (BASE_ADDRESS),  loop invariant offset (OFFSET) and
-  constant offset (INIT).  Examples, in loop nest 
-  
+  constant offset (INIT).  Examples, in loop nest
+
   for (i = 0; i < 100; i++)
     for (j = 3; j < 100; j++)
 
                        Example 1                      Example 2
       data-ref         a[j].b[i][j]                   *(p + x + 16B + 4B * j)
-      
+
 
   innermost_loop_behavior
       base_address     &a                             p
@@ -79,7 +79,7 @@
 {
   /* The object.  */
   tree base_object;
-  
+
   /* A list of chrecs.  Access functions of the indices.  */
   VEC(tree,heap) *access_fns;
 };
@@ -88,7 +88,6 @@
 {
   /* The alias information that should be used for new pointers to this
      location.  SYMBOL_TAG is either a DECL or a SYMBOL_MEMORY_TAG.  */
-  tree symbol_tag;
   struct ptr_info_def *ptr_info;
 
   /* The set of virtual operands corresponding to this memory reference,
@@ -97,8 +96,6 @@
   bitmap vops;
 };
 
-typedef struct scop *scop_p;
-
 /* Each vector of the access matrix represents a linear access
    function for a subscript.  First elements correspond to the
    leftmost indices, ie. for a[i][j] the first vector corresponds to
@@ -113,7 +110,7 @@
    |    loop_2
    |      a[i+3][2*j+n-1]
 
-   if "i" varies in loop_1 and "j" varies in loop_2, the access 
+   if "i" varies in loop_1 and "j" varies in loop_2, the access
    matrix with respect to the loop nest {loop_1, loop_2} is:
 
    | loop_1  loop_2  param_n  cst
@@ -166,7 +163,7 @@
 {
   /* A pointer to the statement that contains this DR.  */
   gimple stmt;
-  
+
   /* A pointer to the memory reference.  */
   tree ref;
 
@@ -185,28 +182,22 @@
   /* Alias information for the data reference.  */
   struct dr_alias alias;
 
-  /* The SCoP in which the data reference was analyzed.  */
-  scop_p scop;
-
   /* Matrix representation for the data access functions.  */
   struct access_matrix *access_matrix;
 };
 
-#define DR_SCOP(DR)                (DR)->scop
 #define DR_STMT(DR)                (DR)->stmt
 #define DR_REF(DR)                 (DR)->ref
 #define DR_BASE_OBJECT(DR)         (DR)->indices.base_object
 #define DR_ACCESS_FNS(DR)	   (DR)->indices.access_fns
 #define DR_ACCESS_FN(DR, I)        VEC_index (tree, DR_ACCESS_FNS (DR), I)
-#define DR_NUM_DIMENSIONS(DR)      VEC_length (tree, DR_ACCESS_FNS (DR))  
+#define DR_NUM_DIMENSIONS(DR)      VEC_length (tree, DR_ACCESS_FNS (DR))
 #define DR_IS_READ(DR)             (DR)->is_read
 #define DR_BASE_ADDRESS(DR)        (DR)->innermost.base_address
 #define DR_OFFSET(DR)              (DR)->innermost.offset
 #define DR_INIT(DR)                (DR)->innermost.init
 #define DR_STEP(DR)                (DR)->innermost.step
-#define DR_SYMBOL_TAG(DR)          (DR)->alias.symbol_tag
 #define DR_PTR_INFO(DR)            (DR)->alias.ptr_info
-#define DR_VOPS(DR)		   (DR)->alias.vops
 #define DR_ALIGNED_TO(DR)          (DR)->innermost.aligned_to
 #define DR_ACCESS_MATRIX(DR)       (DR)->access_matrix
 
@@ -215,9 +206,9 @@
 DEF_VEC_ALLOC_P (data_reference_p, heap);
 
 enum data_dependence_direction {
-  dir_positive, 
-  dir_negative, 
-  dir_equal, 
+  dir_positive,
+  dir_negative,
+  dir_equal,
   dir_positive_or_negative,
   dir_positive_or_equal,
   dir_negative_or_equal,
@@ -261,11 +252,11 @@
      accessed twice.  */
   conflict_function *conflicting_iterations_in_a;
   conflict_function *conflicting_iterations_in_b;
-  
+
   /* This field stores the information about the iteration domain
      validity of the dependence relation.  */
   tree last_conflict;
-  
+
   /* Distance from the iteration that access a conflicting element in
      A to the iteration that access this same conflicting element in
      B.  The distance is a tree scalar expression, i.e. a constant or a
@@ -287,23 +278,23 @@
 
 struct data_dependence_relation
 {
-  
+
   struct data_reference *a;
   struct data_reference *b;
 
   /* A "yes/no/maybe" field for the dependence relation:
-     
+
      - when "ARE_DEPENDENT == NULL_TREE", there exist a dependence
        relation between A and B, and the description of this relation
        is given in the SUBSCRIPTS array,
-     
+
      - when "ARE_DEPENDENT == chrec_known", there is no dependence and
        SUBSCRIPTS is empty,
-     
+
      - when "ARE_DEPENDENT == chrec_dont_know", there may be a dependence,
        but the analyzer cannot be more specific.  */
   tree are_dependent;
-  
+
   /* For each subscript in the dependence test, there is an element in
      this array.  This is the attribute that labels the edge A->B of
      the data_dependence_relation.  */
@@ -386,7 +377,10 @@
 extern bool compute_data_dependences_for_loop (struct loop *, bool,
 					       VEC (data_reference_p, heap) **,
 					       VEC (ddr_p, heap) **);
-extern tree find_data_references_in_loop (struct loop *, 
+extern bool compute_data_dependences_for_bb (basic_block, bool,
+                                             VEC (data_reference_p, heap) **,
+                                             VEC (ddr_p, heap) **);
+extern tree find_data_references_in_loop (struct loop *,
                                           VEC (data_reference_p, heap) **);
 extern void print_direction_vector (FILE *, lambda_vector, int);
 extern void print_dir_vectors (FILE *, VEC (lambda_vector, heap) *, int);
@@ -395,13 +389,15 @@
 extern void dump_ddrs (FILE *, VEC (ddr_p, heap) *);
 extern void dump_dist_dir_vectors (FILE *, VEC (ddr_p, heap) *);
 extern void dump_data_reference (FILE *, struct data_reference *);
+extern void debug_data_reference (struct data_reference *);
 extern void dump_data_references (FILE *, VEC (data_reference_p, heap) *);
+extern void debug_data_references (VEC (data_reference_p, heap) *);
 extern void debug_data_dependence_relation (struct data_dependence_relation *);
-extern void dump_data_dependence_relation (FILE *, 
+extern void dump_data_dependence_relation (FILE *,
 					   struct data_dependence_relation *);
 extern void dump_data_dependence_relations (FILE *, VEC (ddr_p, heap) *);
 extern void debug_data_dependence_relations (VEC (ddr_p, heap) *);
-extern void dump_data_dependence_direction (FILE *, 
+extern void dump_data_dependence_direction (FILE *,
 					    enum data_dependence_direction);
 extern void free_dependence_relation (struct data_dependence_relation *);
 extern void free_dependence_relations (VEC (ddr_p, heap) *);
@@ -409,6 +405,8 @@
 extern void free_data_refs (VEC (data_reference_p, heap) *);
 extern bool find_data_references_in_stmt (struct loop *, gimple,
 					  VEC (data_reference_p, heap) **);
+extern bool graphite_find_data_references_in_stmt (struct loop *, gimple,
+						   VEC (data_reference_p, heap) **);
 struct data_reference *create_data_ref (struct loop *, tree, gimple, bool);
 extern bool find_loop_nest (struct loop *, VEC (loop_p, heap) **);
 extern void compute_all_dependences (VEC (data_reference_p, heap) *,
@@ -418,7 +416,6 @@
 extern void create_rdg_vertices (struct graph *, VEC (gimple, heap) *);
 extern bool dr_may_alias_p (const struct data_reference *,
 			    const struct data_reference *);
-extern bool stmt_simple_memref_p (struct loop *, gimple, tree);
 
 /* Return true when the DDR contains two data references that have the
    same access functions.  */
@@ -507,29 +504,28 @@
 void debug_rdg_component (struct graph *, int);
 void dump_rdg (FILE *, struct graph *);
 void debug_rdg (struct graph *);
-void dot_rdg (struct graph *);
 int rdg_vertex_for_stmt (struct graph *, gimple);
 
 /* Data dependence type.  */
 
-enum rdg_dep_type 
+enum rdg_dep_type
 {
   /* Read After Write (RAW).  */
   flow_dd = 'f',
-  
+
   /* Write After Read (WAR).  */
   anti_dd = 'a',
-  
+
   /* Write After Write (WAW).  */
-  output_dd = 'o', 
-  
+  output_dd = 'o',
+
   /* Read After Read (RAR).  */
-  input_dd = 'i' 
+  input_dd = 'i'
 };
 
 /* Dependence information attached to an edge of the RDG.  */
 
-typedef struct rdg_edge 
+typedef struct rdg_edge
 {
   /* Type of the dependence.  */
   enum rdg_dep_type type;