From 99150b053e1840ffc47704a9188e26c889d07517 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 28 Nov 2019 09:06:09 +0100 Subject: [PATCH] re PR c++/92695 (P1064R0 - virtual constexpr fails if object taken from array) PR c++/92695 * decl2.c (mark_used): Don't call note_vague_linkage_fn for pure virtual functions, even if they are declared inline. * g++.dg/warn/inline3.C: New test. From-SVN: r278802 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/decl2.c | 7 +++++-- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/warn/inline3.C | 20 ++++++++++++++++++++ 4 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/warn/inline3.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ec37f5ec4f2..8b71f02cf10 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2019-11-28 Jakub Jelinek + + PR c++/92695 + * decl2.c (mark_used): Don't call note_vague_linkage_fn for pure + virtual functions, even if they are declared inline. + 2019-11-16 Jason Merrill Implement P1814R0, CTAD for alias templates. diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index f164494afdc..46cc58265a6 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -5596,8 +5596,11 @@ mark_used (tree decl, tsubst_flags_t complain) vec_safe_push (no_linkage_decls, decl); } - if (TREE_CODE (decl) == FUNCTION_DECL && DECL_DECLARED_INLINE_P (decl) - && !DECL_INITIAL (decl) && !DECL_ARTIFICIAL (decl)) + if (TREE_CODE (decl) == FUNCTION_DECL + && DECL_DECLARED_INLINE_P (decl) + && !DECL_INITIAL (decl) + && !DECL_ARTIFICIAL (decl) + && !DECL_PURE_VIRTUAL_P (decl)) /* Remember it, so we can check it was defined. */ note_vague_linkage_fn (decl); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4f97f4cc58c..0bcac2a12b5 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-11-28 Jakub Jelinek + + PR c++/92695 + * g++.dg/warn/inline3.C: New test. + 2019-11-27 Jakub Jelinek PR rtl-optimization/92510 diff --git a/gcc/testsuite/g++.dg/warn/inline3.C b/gcc/testsuite/g++.dg/warn/inline3.C new file mode 100644 index 00000000000..0d4dc8ff268 --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/inline3.C @@ -0,0 +1,20 @@ +struct S { + inline virtual void foo () = 0; // { dg-bogus "used but never defined" } +#if __cplusplus > 201703L + constexpr virtual void bar () = 0; // { dg-bogus "used but never defined" "" { target c++2a } } +#else + inline virtual void bar () = 0; // { dg-bogus "used but never defined" "" { target c++17_down } } +#endif + S () {} +}; +struct T : public S { + inline virtual void foo () {} +#if __cplusplus > 201703L + constexpr virtual void bar () {} +#else + inline virtual void bar () {} +#endif + T () {} +}; +T t; +void foo (S *s) { s->foo (); s->bar (); } -- 2.30.2