OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

stmt.c (add_case_node): Make sure that we have integer constant before calling tree_int_cst_compare. 

2004-10-14  Andrew Pinski  <pinskia@physics.uc.edu>

        * stmt.c (add_case_node): Make sure that we have integer
        constant before calling tree_int_cst_compare.

From-SVN: r89058
This commit is contained in:
Andrew Pinski 2004-10-14 22:01:45 +00:00 committed by Andrew Pinski
parent 4965c1630e
commit b77aa1f774
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ChangeLog
View File

@ -1,3 +1,8 @@
2004-10-14 Andrew Pinski <pinskia@physics.uc.edu>
* stmt.c (add_case_node): Make sure that we have integer
constant before calling tree_int_cst_compare.
2004-10-14 Andrew Pinski <pinskia@physics.uc.edu>
PR middle-end/17967

18
gcc/stmt.c
View File

@ -2139,8 +2139,10 @@ add_case_node (struct case_node *head, tree type, tree low, tree high,
if (!high || tree_int_cst_equal (low, high))
{
/* If the simple case value is unreachable, ignore it. */
if (tree_int_cst_compare (low, min_value) < 0
|| tree_int_cst_compare (low, max_value) > 0)
if ((TREE_CODE (min_value) == INTEGER_CST
&& tree_int_cst_compare (low, min_value) < 0)
|| (TREE_CODE (max_value) == INTEGER_CST
&& tree_int_cst_compare (low, max_value) > 0))
return head;
low = fold_convert (type, low);
high = low;
@ -2148,19 +2150,23 @@ add_case_node (struct case_node *head, tree type, tree low, tree high,
else
{
/* If the entire case range is unreachable, ignore it. */
if (tree_int_cst_compare (high, min_value) < 0
|| tree_int_cst_compare (low, max_value) > 0)
if ((TREE_CODE (min_value) == INTEGER_CST
&& tree_int_cst_compare (high, min_value) < 0)
|| (TREE_CODE (max_value) == INTEGER_CST
&& tree_int_cst_compare (low, max_value) > 0))
return head;
/* If the lower bound is less than the index type's minimum
value, truncate the range bounds. */
if (tree_int_cst_compare (low, min_value) < 0)
if (TREE_CODE (min_value) == INTEGER_CST
&& tree_int_cst_compare (low, min_value) < 0)
low = min_value;
low = fold_convert (type, low);
/* If the upper bound is greater than the index type's maximum
value, truncate the range bounds. */
if (tree_int_cst_compare (high, max_value) > 0)
if (TREE_CODE (max_value) == INTEGER_CST
&& tree_int_cst_compare (high, max_value) > 0)
high = max_value;
high = fold_convert (type, high);
}