From b77aa1f774128032e69cfa52a5c4726b5029d313 Mon Sep 17 00:00:00 2001 From: Andrew Pinski Date: Thu, 14 Oct 2004 22:01:45 +0000 Subject: [PATCH] stmt.c (add_case_node): Make sure that we have integer constant before calling tree_int_cst_compare. 2004-10-14 Andrew Pinski * stmt.c (add_case_node): Make sure that we have integer constant before calling tree_int_cst_compare. From-SVN: r89058 --- gcc/ChangeLog | 5 +++++ gcc/stmt.c | 18 ++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d36603a7228..8f4d0337949 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2004-10-14 Andrew Pinski + + * stmt.c (add_case_node): Make sure that we have integer + constant before calling tree_int_cst_compare. + 2004-10-14 Andrew Pinski PR middle-end/17967 diff --git a/gcc/stmt.c b/gcc/stmt.c index 5560dbc5b2d..a9bb3e6682a 100644 --- a/gcc/stmt.c +++ b/gcc/stmt.c @@ -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); } -- 2.30.2