From fea3397e56a3662a9b2361c14e427c9786042ebf Mon Sep 17 00:00:00 2001
From: Marek Polacek <polacek@redhat.com>
Date: Tue, 24 Sep 2019 14:38:53 +0000
Subject: [PATCH] PR c++/91845 - ICE with invalid pointer-to-member.
* expr.c (mark_use): Use error_operand_p.
* typeck2.c (build_m_component_ref): Check error_operand_p after
calling mark_[lr]value_use.
* g++.dg/cpp1y/pr91845.C: New test.
From-SVN: r276102
---
gcc/cp/ChangeLog | 7 +++++++
gcc/cp/expr.c | 2 +-
gcc/cp/typeck2.c | 6 +++---
gcc/testsuite/ChangeLog | 5 +++++
gcc/testsuite/g++.dg/cpp1y/pr91845.C | 14 ++++++++++++++
5 files changed, 30 insertions(+), 4 deletions(-)
create mode 100644 gcc/testsuite/g++.dg/cpp1y/pr91845.C
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5b561e6bdbb7..1cd2a630c79e 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2019-09-24 Marek Polacek <polacek@redhat.com>
+
+ PR c++/91845 - ICE with invalid pointer-to-member.
+ * expr.c (mark_use): Use error_operand_p.
+ * typeck2.c (build_m_component_ref): Check error_operand_p after
+ calling mark_[lr]value_use.
+
2019-09-23 Paolo Carlini <paolo.carlini@oracle.com>
* pt.c (check_explicit_specialization): Use cp_expr_loc_or_input_loc.
diff --git a/gcc/cp/expr.c b/gcc/cp/expr.c
index 212a7f93c5a2..d488912d5dbf 100644
--- a/gcc/cp/expr.c
+++ b/gcc/cp/expr.c
@@ -96,7 +96,7 @@ mark_use (tree expr, bool rvalue_p, bool read_p,
{
#define RECUR(t) mark_use ((t), rvalue_p, read_p, loc, reject_builtin)
- if (expr == NULL_TREE || expr == error_mark_node)
+ if (expr == NULL_TREE || error_operand_p (expr))
return expr;
if (reject_builtin && reject_gcc_builtin (expr, loc))
diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index d5098fa24bb4..58fa54f40af5 100644
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -2068,12 +2068,12 @@ build_m_component_ref (tree datum, tree component, tsubst_flags_t complain)
tree binfo;
tree ctype;
- if (error_operand_p (datum) || error_operand_p (component))
- return error_mark_node;
-
datum = mark_lvalue_use (datum);
component = mark_rvalue_use (component);
+ if (error_operand_p (datum) || error_operand_p (component))
+ return error_mark_node;
+
ptrmem_type = TREE_TYPE (component);
if (!TYPE_PTRMEM_P (ptrmem_type))
{
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 55b3bab945b9..a38a0573c28d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-09-24 Marek Polacek <polacek@redhat.com>
+
+ PR c++/91845 - ICE with invalid pointer-to-member.
+ * g++.dg/cpp1y/pr91845.C: New test.
+
2019-09-24 Kyrylo Tkachov <kyrylo.tkachov@arm.com>
* gcc.target/aarch64/nosplit-di-const-volatile_1.c: New test.
diff --git a/gcc/testsuite/g++.dg/cpp1y/pr91845.C b/gcc/testsuite/g++.dg/cpp1y/pr91845.C
new file mode 100644
index 000000000000..cb80dd7a8a74
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1y/pr91845.C
@@ -0,0 +1,14 @@
+// PR c++/91845 - ICE with invalid pointer-to-member.
+// { dg-do compile { target c++14 } }
+
+void non_const_mem_ptr() {
+ struct A {
+ };
+ constexpr A a = {1, 2}; // { dg-error "too many initializers" }
+ struct B {
+ int A::*p;
+ constexpr int g() const {
+ return a.*p; // { dg-error "use of local variable" }
+ };
+ };
+}
--
GitLab