From 32e37414af3e1e236a2c7400c9d7178ede77ce4d Mon Sep 17 00:00:00 2001
From: Yury Gribov <tetra2005@gmail.com>
Date: Fri, 16 Jun 2017 07:16:34 +0000
Subject: [PATCH] re PR tree-optimization/81089 (ICE: tree check: expected
ssa_name, have integer_cst in register_edge_assert_for_2, at tree-vrp.c:5023)
2017-06-16 Yury Gribov <tetra2005@gmail.com>
PR tree-optimization/81089
* tree-vrp.c (is_masked_range_test): Validate operands of
subexpression.
From-SVN: r249237
---
gcc/ChangeLog | 6 ++++++
gcc/tree-vrp.c | 7 +++----
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index df4da476a6c7..3f883c2b7a88 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2017-06-16 Yury Gribov <tetra2005@gmail.com>
+
+ PR tree-optimization/81089
+ * tree-vrp.c (is_masked_range_test): Validate operands of
+ subexpression.
+
2017-06-15 Martin Sebor <msebor@redhat.com>
PR c++/80560
diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c
index a7424a3f8e2b..9ca3924ea89c 100644
--- a/gcc/tree-vrp.c
+++ b/gcc/tree-vrp.c
@@ -5651,8 +5651,9 @@ is_masked_range_test (tree name, tree valt, enum tree_code cond_code,
|| gimple_assign_rhs_code (def_stmt) != BIT_AND_EXPR)
return false;
+ tree t = gimple_assign_rhs1 (def_stmt);
tree maskt = gimple_assign_rhs2 (def_stmt);
- if (TREE_CODE (maskt) != INTEGER_CST)
+ if (TREE_CODE (t) != SSA_NAME || TREE_CODE (maskt) != INTEGER_CST)
return false;
wide_int mask = maskt;
@@ -5663,11 +5664,9 @@ is_masked_range_test (tree name, tree valt, enum tree_code cond_code,
|| (val & mask) != val)
return false;
- tree t = gimple_assign_rhs1 (def_stmt);
- tree type = TREE_TYPE (t);
-
bool is_range = cond_code == EQ_EXPR;
+ tree type = TREE_TYPE (t);
wide_int min = wi::min_value (type),
max = wi::max_value (type);
--
GitLab