Here the implicit use of 'this' in inner.size() template argument was
being rejected despite P2280R4 relaxations, due to the special *this
handling in the INDIRECT_REF case of potential_constant_expression_1.
This handling was originally added by r196737 as part of the PR56481,
and it seems obsolete especially in light of P2280R4. There doesn't
seem to be a good reason that we need to handle *this specially from
other dereferences.
This patch therefore removes this special handling. A side benefit of
this is that we now correctly reject some *reinterpret_cast<...>(...)
earlier, by p_c_e_1 rather than by constexpr evaluation (because the
STRIP_NOPS in the removed code was hiding the cast), which causes a
couple of diagnostic adjustments.
PR c++/118249
gcc/cp/ChangeLog:
* constexpr.cc (potential_constant_expression_1)
<case INDIRECT_REF>: Remove obsolete *this handling.
gcc/testsuite/ChangeLog:
* g++.dg/cpp0x/constexpr-reinterpret2.C:
* g++.dg/cpp23/constexpr-nonlit12.C:
* g++.dg/cpp0x/constexpr-ref14.C: New test.
---
gcc/cp/constexpr.cc | 17 +--------------
gcc/testsuite/g++.dg/cpp0x/constexpr-ref14.C | 21 +++++++++++++++++++
.../g++.dg/cpp0x/constexpr-reinterpret2.C | 4 ++--
.../g++.dg/cpp23/constexpr-nonlit12.C | 2 +-
4 files changed, 25 insertions(+), 19 deletions(-)
create mode 100644 gcc/testsuite/g++.dg/cpp0x/constexpr-ref14.C
diff --git a/gcc/cp/constexpr.cc b/gcc/cp/constexpr.cc
index 9a57f4865e0..37ea65cb655 100644
--- a/gcc/cp/constexpr.cc
+++ b/gcc/cp/constexpr.cc
@@ -10279,22 +10279,7 @@ potential_constant_expression_1 (tree t, bool
want_rval, bool strict, bool now,
return true;
case INDIRECT_REF:
- {
- tree x = TREE_OPERAND (t, 0);
- STRIP_NOPS (x);
- if (is_this_parameter (x) && !is_capture_proxy (x))
- {
- if (now || !var_in_maybe_constexpr_fn (x))
- {
- if (flags & tf_error)
- constexpr_error (loc, fundef_p, "use of %<this%> in a "
- "constant expression");
- return false;
- }
- return true;
- }
- return RECUR (x, rval);
- }
+ return RECUR (TREE_OPERAND (t, 0), rval);
case STATEMENT_LIST:
for (tree stmt : tsi_range (t))
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ref14.C
b/gcc/testsuite/g++.dg/cpp0x/constexpr-ref14.C
new file mode 100644
index 00000000000..f201afbd81f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ref14.C
@@ -0,0 +1,21 @@
+// PR c++/118249
+// { dg-do compile { target c++11 } }
+
+template <int I>
+void f() { }
+
+template <int N>
+struct array {
+ constexpr int size() const { return N; }
+};
+
+extern array<10>& outer;
+
+struct C {
+ array<10> inner;
+
+ void g() {
+ f<outer.size()>(); // OK
+ f<inner.size()>(); // was error: use of 'this' in a constant expression
+ }
+};
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-reinterpret2.C
b/gcc/testsuite/g++.dg/cpp0x/constexpr-reinterpret2.C
index 1bc2a8f3012..52328bc4ff5 100644
--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-reinterpret2.C
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-reinterpret2.C
@@ -17,5 +17,5 @@ bar ()
return ((void **) &s)[0]; // { dg-error "reinterpret_cast" }
}
-constexpr auto x = foo ();
-constexpr auto y = bar ();
+constexpr auto x = foo (); // { dg-error "called in a constant expression" }
+constexpr auto y = bar (); // { dg-error "called in a constant expression" }
diff --git a/gcc/testsuite/g++.dg/cpp23/constexpr-nonlit12.C
b/gcc/testsuite/g++.dg/cpp23/constexpr-nonlit12.C
index 8f003b80190..b104b16784f 100644
--- a/gcc/testsuite/g++.dg/cpp23/constexpr-nonlit12.C
+++ b/gcc/testsuite/g++.dg/cpp23/constexpr-nonlit12.C
@@ -19,6 +19,6 @@ void
g ()
{
constexpr int i = 42;
- constexpr auto a1 = fn0 (&i);
+ constexpr auto a1 = fn0 (&i); // { dg-error "called in a constant
expression" }
constexpr auto a2 = fn1 (i); // { dg-error "called in a constant expression"
}
}
--
2.49.0.111.g5b97a56fa0
