aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2021-11-10 16:42:04 -0500
committerJason Merrill <jason@redhat.com>2021-11-15 02:30:26 -0500
commit267318a2857a42922c3ca033dac4690172b17683 (patch)
tree4ea96e675ff964d102e803ef0466151b09c5dd73 /gcc/cp
parentadcfd2c45c3523d74279b5fcac1d7c6c34dd1382 (diff)
downloadgcc-267318a2857a42922c3ca033dac4690172b17683.zip
gcc-267318a2857a42922c3ca033dac4690172b17683.tar.gz
gcc-267318a2857a42922c3ca033dac4690172b17683.tar.bz2
c++: constexpr virtual and vbase thunk
C++20 allows virtual functions to be constexpr. I don't think that calling through a pointer to a vbase subobject is supposed to work in a constant expression, since an object with virtual bases can't be constant, but the call shouldn't ICE. gcc/cp/ChangeLog: * constexpr.c (cxx_eval_thunk_call): Error instead of ICE on vbase thunk to constexpr function. gcc/testsuite/ChangeLog: * g++.dg/cpp2a/constexpr-virtual20.C: New test.
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/constexpr.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index 453007c..7c27131 100644
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -2246,15 +2246,20 @@ cxx_eval_thunk_call (const constexpr_ctx *ctx, tree t, tree thunk_fndecl,
{
tree function = THUNK_TARGET (thunk_fndecl);
- /* virtual_offset is only set in the presence of virtual bases, which make
- the class non-literal, so we don't need to handle it here. */
if (THUNK_VIRTUAL_OFFSET (thunk_fndecl))
{
- gcc_assert (!DECL_DECLARED_CONSTEXPR_P (function));
if (!ctx->quiet)
{
- error ("call to non-%<constexpr%> function %qD", function);
- explain_invalid_constexpr_fn (function);
+ if (!DECL_DECLARED_CONSTEXPR_P (function))
+ {
+ error ("call to non-%<constexpr%> function %qD", function);
+ explain_invalid_constexpr_fn (function);
+ }
+ else
+ /* virtual_offset is only set for virtual bases, which make the
+ class non-literal, so we don't need to handle it here. */
+ error ("calling constexpr member function %qD through virtual "
+ "base subobject", function);
}
*non_constant_p = true;
return t;