aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/tree-ssa-ccp.c14
2 files changed, 16 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2842a7f..5785081 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
2019-09-18 Richard Sandiford <richard.sandiford@arm.com>
+ * tree-ssa-ccp.c (get_value_for_expr): Check whether CONSTANTs
+ are INTEGER_CSTs.
+
+2019-09-18 Richard Sandiford <richard.sandiford@arm.com>
+
* gimplify.c (gimplify_decl_expr): Use poly_int_tree_p instead
of checking specifically for INTEGER_CST.
diff --git a/gcc/tree-ssa-ccp.c b/gcc/tree-ssa-ccp.c
index 5af3810..311918b 100644
--- a/gcc/tree-ssa-ccp.c
+++ b/gcc/tree-ssa-ccp.c
@@ -615,9 +615,17 @@ get_value_for_expr (tree expr, bool for_bits_p)
val.mask = -1;
}
if (for_bits_p
- && val.lattice_val == CONSTANT
- && TREE_CODE (val.value) == ADDR_EXPR)
- val = get_value_from_alignment (val.value);
+ && val.lattice_val == CONSTANT)
+ {
+ if (TREE_CODE (val.value) == ADDR_EXPR)
+ val = get_value_from_alignment (val.value);
+ else if (TREE_CODE (val.value) != INTEGER_CST)
+ {
+ val.lattice_val = VARYING;
+ val.value = NULL_TREE;
+ val.mask = -1;
+ }
+ }
/* Fall back to a copy value. */
if (!for_bits_p
&& val.lattice_val == VARYING