From 37a87f690d2ec0beeeb43b8549f59dd01175e8f0 Mon Sep 17 00:00:00 2001 From: rguenth Date: Fri, 16 Jun 2017 07:16:34 +0000 Subject: [PATCH] 2017-06-16 Yury Gribov PR tree-optimization/81089 * tree-vrp.c (is_masked_range_test): Validate operands of subexpression. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@249237 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/tree-vrp.c | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index df4da476a6c..3f883c2b7a8 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2017-06-16 Yury Gribov + + PR tree-optimization/81089 + * tree-vrp.c (is_masked_range_test): Validate operands of + subexpression. + 2017-06-15 Martin Sebor PR c++/80560 diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c index a7424a3f8e2..9ca3924ea89 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); -- 2.11.4.GIT