aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew MacLeod <amacleod@redhat.com>2022-12-06 10:41:29 -0500
committerAndrew MacLeod <amacleod@redhat.com>2022-12-08 08:52:55 -0500
commit0ef9991d8767932f51fa97753c16058d17b29b18 (patch)
tree0a6bfb5dd99d68cca239dcfa6dedcf0119298d98
parentbb2e5da7ef7740269ae95533179de8d186ee04bc (diff)
downloadgcc-0ef9991d8767932f51fa97753c16058d17b29b18.zip
gcc-0ef9991d8767932f51fa97753c16058d17b29b18.tar.gz
gcc-0ef9991d8767932f51fa97753c16058d17b29b18.tar.bz2
Ensure arguments to range-op handler are supported.
PR tree-optimization/107985 gcc/ * gimple-range-op.cc (gimple_range_op_handler::gimple_range_op_handler): Check if type of the operands is supported. * gimple-range.cc (gimple_ranger::prefill_stmt_dependencies): Do not assert if here is no range-op handler. gcc/testsuite/ * g++.dg/pr107985.C: New.
-rw-r--r--gcc/gimple-range-op.cc6
-rw-r--r--gcc/gimple-range.cc24
-rw-r--r--gcc/testsuite/g++.dg/pr107985.C18
3 files changed, 37 insertions, 11 deletions
diff --git a/gcc/gimple-range-op.cc b/gcc/gimple-range-op.cc
index 7764166..1206854 100644
--- a/gcc/gimple-range-op.cc
+++ b/gcc/gimple-range-op.cc
@@ -148,6 +148,9 @@ gimple_range_op_handler::gimple_range_op_handler (gimple *s)
case GIMPLE_COND:
m_op1 = gimple_cond_lhs (m_stmt);
m_op2 = gimple_cond_rhs (m_stmt);
+ // Check that operands are supported types. One check is enough.
+ if (!Value_Range::supports_type_p (TREE_TYPE (m_op1)))
+ m_valid = false;
return;
case GIMPLE_ASSIGN:
m_op1 = gimple_range_base_of_assignment (m_stmt);
@@ -164,6 +167,9 @@ gimple_range_op_handler::gimple_range_op_handler (gimple *s)
}
if (gimple_num_ops (m_stmt) >= 3)
m_op2 = gimple_assign_rhs2 (m_stmt);
+ // Check that operands are supported types. One check is enough.
+ if ((m_op1 && !Value_Range::supports_type_p (TREE_TYPE (m_op1))))
+ m_valid = false;
return;
default:
gcc_unreachable ();
diff --git a/gcc/gimple-range.cc b/gcc/gimple-range.cc
index ecd6039..8c05582 100644
--- a/gcc/gimple-range.cc
+++ b/gcc/gimple-range.cc
@@ -422,18 +422,20 @@ gimple_ranger::prefill_stmt_dependencies (tree ssa)
else
{
gimple_range_op_handler handler (stmt);
- gcc_checking_assert (handler);
- tree op = handler.operand2 ();
- if (op)
+ if (handler)
{
- Value_Range r (TREE_TYPE (op));
- prefill_name (r, op);
- }
- op = handler.operand1 ();
- if (op)
- {
- Value_Range r (TREE_TYPE (op));
- prefill_name (r, op);
+ tree op = handler.operand2 ();
+ if (op)
+ {
+ Value_Range r (TREE_TYPE (op));
+ prefill_name (r, op);
+ }
+ op = handler.operand1 ();
+ if (op)
+ {
+ Value_Range r (TREE_TYPE (op));
+ prefill_name (r, op);
+ }
}
}
}
diff --git a/gcc/testsuite/g++.dg/pr107985.C b/gcc/testsuite/g++.dg/pr107985.C
new file mode 100644
index 0000000..8d244b5
--- /dev/null
+++ b/gcc/testsuite/g++.dg/pr107985.C
@@ -0,0 +1,18 @@
+/* { dg-do compile } */
+/* { dg-options "-O1 -ftree-vrp -fno-tree-ccp -fno-tree-forwprop -fno-tree-fre" } */
+
+struct B {
+ int f;
+};
+
+struct D : public B {
+};
+
+void foo() {
+ D d;
+ d.f = 7;
+
+ int B::* pfb = &B::f;
+ int D::* pfd = pfb;
+ int v = d.*pfd;
+}