Add upstream patch for bug #336157 and regen 93_all_gcc-4.5-cloog-dl.patch.

3 files changed, 67 insertions, 2 deletions

diff --git a/4.5.2/gentoo/21_all_4.5.2_pr45552_graphite-ICE.patch b/4.5.2/gentoo/21_all_4.5.2_pr45552_graphite-ICE.patch
new file mode 100644
index 0000000..f16c69f
--- /dev/null
+++ b/4.5.2/gentoo/21_all_4.5.2_pr45552_graphite-ICE.patch
@@ -0,0 +1,64 @@
+[graphite] ICE in sese_loop_depth, at sese.h
+
+http://gcc.gnu.org/PR45552
+https://bugs.gentoo.org/336157
+
+--- gcc/graphite.c
++++ gcc/graphite.c
+@@ -210,6 +210,7 @@
+       return false;
+     }
+ 
++  scev_reset ();
+   recompute_all_dominators ();
+   initialize_original_copy_tables ();
+   cloog_initialize ();
+--- gcc/testsuite/gcc.dg/graphite/pr45552.c
++++ gcc/testsuite/gcc.dg/graphite/pr45552.c
+@@ -0,0 +1,46 @@
++typedef struct
++{
++  double z;
++} Vector;
++typedef struct
++{
++  float *vertex;
++  float *normal;
++} VertexArray;
++typedef struct
++{
++  Vector *vertex;
++  int num_vertex;
++} ObjectSmooth;
++typedef struct
++{
++  int num_cells;
++} State;
++static void *array_from_ObjectSmooth( ObjectSmooth *obj )
++{
++  int i, j;
++  VertexArray *array = (VertexArray *) __builtin_malloc( sizeof( VertexArray ) );
++  array->vertex = (float *) __builtin_malloc( 3*sizeof(float)*obj->num_vertex );
++  array->normal = (float *) __builtin_malloc( 3*sizeof(float)*obj->num_vertex );
++  for (i=0, j=0; i<obj->num_vertex; ++i) {
++    array->normal[j++] = 9;
++    array->vertex[j] = obj->vertex[i].z;
++    array->normal[j++] = 1;
++  }
++}
++static void draw_cell( void )
++{
++  glCallList( array_from_ObjectSmooth( (ObjectSmooth *) __builtin_malloc(10) ));
++}
++static int render( State *st)
++{
++  int b;
++  for (b=0; b<st->num_cells; ++b) {
++    draw_cell();
++    draw_cell();
++  }
++}
++reshape_glcells( int width, int height )
++{
++  render( 0 );
++}
diff --git a/4.5.2/gentoo/93_all_gcc-4.5-cloog-dl.patch b/4.5.2/gentoo/93_all_gcc-4.5-cloog-dl.patch
index 9c87f9b..62cc3c2 100644
--- a/4.5.2/gentoo/93_all_gcc-4.5-cloog-dl.patch
+++ b/4.5.2/gentoo/93_all_gcc-4.5-cloog-dl.patch
@@ -238,9 +238,9 @@ http://cvs.fedoraproject.org/viewvc/devel/gcc/gcc45-cloog-dl.patch
 +      return false;
 +    }
 +
+   scev_reset ();
    recompute_all_dominators ();
    initialize_original_copy_tables ();
-   cloog_initialize ();
 --- a/gcc/graphite.h
 +++ b/gcc/graphite.h
 @@ -21,4 +21,224 @@ along with GCC; see the file COPYING3.  If not see
diff --git a/4.5.2/gentoo/README.history b/4.5.2/gentoo/README.history
index 9f5bd60..fe237ba 100644
--- a/4.5.2/gentoo/README.history
+++ b/4.5.2/gentoo/README.history
@@ -10,6 +10,7 @@
 	+ 14_all_gcc-sparc64-bsd.patch 
 	+ 15_all_gcc-libgomp-no-werror.patch 
 	+ 20_all_4.5.2_pr46734_ICE.patch
+	+ 21_all_4.5.2_pr45552_graphite-ICE.patch
 	+ 40_all_gcc-4.4-libiberty.h-asprintf.patch 
 	+ 47_all_arm-unbreak-armv4t.patch 
 	+ 51_all_gcc-3.4-libiberty-pic.patch 
@@ -18,6 +19,6 @@
 	+ 61_all_gcc4-ia64-noteGNUstack.patch 
 	+ 74_all_sh-pr24836.patch 
 	+ 91_all_gcc-fbsdshared-spec.patch 
-	+ 93_all_gcc-4.5-cloog-dl.patch 
+	U 93_all_gcc-4.5-cloog-dl.patch 
 	+ 94_all_gcc-4.5-pch-nostdinc.patch 
 	+ 95_all_arm-pr43440.patch