From 119adb56544f6297218e0527ee3ebb18071fbb35 Mon Sep 17 00:00:00 2001 From: spop Date: Sat, 13 Mar 2010 17:35:29 +0000 Subject: [PATCH] Use ssizetype when long_long_integer_type_node is NULL. 2010-03-11 Sebastian Pop * graphite-clast-to-gimple.c (my_long_long): Defined. (gcc_type_for_cloog_iv): Use it instead of long_long_integer_type_node. * graphite-sese-to-poly.c (my_long_long): Defined. (scop_ivs_can_be_represented): Use it. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@157438 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog.graphite | 7 +++++++ gcc/graphite-clast-to-gimple.c | 15 ++++++++++----- gcc/graphite-sese-to-poly.c | 6 +++++- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite index 75fe38f5ecf..abd98882293 100644 --- a/gcc/ChangeLog.graphite +++ b/gcc/ChangeLog.graphite @@ -1,3 +1,10 @@ +2010-03-11 Sebastian Pop + + * graphite-clast-to-gimple.c (my_long_long): Defined. + (gcc_type_for_cloog_iv): Use it instead of long_long_integer_type_node. + * graphite-sese-to-poly.c (my_long_long): Defined. + (scop_ivs_can_be_represented): Use it. + 2010-03-10 Sebastian Pop * doc/invoke.texi: Fix documentation of graphite-max-nb-scop-params, diff --git a/gcc/graphite-clast-to-gimple.c b/gcc/graphite-clast-to-gimple.c index 377ca8beeaa..f99a158ac42 100644 --- a/gcc/graphite-clast-to-gimple.c +++ b/gcc/graphite-clast-to-gimple.c @@ -547,6 +547,9 @@ clast_get_body_of_loop (struct clast_stmt *stmt) gcc_unreachable (); } +/* Java does not initialize long_long_integer_type_node. */ +#define my_long_long (long_long_integer_type_node ? long_long_integer_type_node : ssizetype) + /* Given a CLOOG_IV, return the type that CLOOG_IV should have in GCC land. The selected type is big enough to include the original loop iteration variable, but signed to work with the subtractions CLooG @@ -581,8 +584,8 @@ gcc_type_for_cloog_iv (const char *cloog_iv, gimple_bb_p gbb) if (type_precision <= TYPE_PRECISION (long_integer_type_node)) return long_integer_type_node; - if (type_precision <= TYPE_PRECISION (long_long_integer_type_node)) - return long_long_integer_type_node; + if (type_precision <= TYPE_PRECISION (my_long_long)) + return my_long_long; gcc_unreachable (); } @@ -593,17 +596,19 @@ gcc_type_for_cloog_iv (const char *cloog_iv, gimple_bb_p gbb) if (type_precision < TYPE_PRECISION (long_integer_type_node)) return long_integer_type_node; - if (type_precision < TYPE_PRECISION (long_long_integer_type_node)) - return long_long_integer_type_node; + if (type_precision < TYPE_PRECISION (my_long_long)) + return my_long_long; /* There is no signed type available, that is large enough to hold the original value. */ gcc_unreachable (); } - return long_long_integer_type_node; + return my_long_long; } +#undef my_long_long + /* Returns the induction variable for the loop that gets translated to STMT. */ diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c index 28ed07c9998..0f370a80667 100644 --- a/gcc/graphite-sese-to-poly.c +++ b/gcc/graphite-sese-to-poly.c @@ -2910,6 +2910,9 @@ scop_canonicalize_loops (scop_p scop) graphite_loop_normal_form (loop); } +/* Java does not initialize long_long_integer_type_node. */ +#define my_long_long (long_long_integer_type_node ? long_long_integer_type_node : ssizetype) + /* Can all ivs be represented by a signed integer? As CLooG might generate negative values in its expressions, signed loop ivs are required in the backend. */ @@ -2934,13 +2937,14 @@ scop_ivs_can_be_represented (scop_p scop) precision = TYPE_PRECISION (type); if (TYPE_UNSIGNED (type) - && precision >= TYPE_PRECISION (long_long_integer_type_node)) + && precision >= TYPE_PRECISION (my_long_long)) return false; } return true; } +#undef my_long_long /* Builds the polyhedral representation for a SESE region. */ -- 2.11.0