From 333cb61200ca99b916a71e989e25cf68a6ab597a Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Sat, 30 Sep 2017 17:00:32 +0000 Subject: [PATCH] re PR c++/68754 (Explicitly defaulted constexpr assignment operator fails to compile) /cp 2017-09-30 Paolo Carlini PR c++/68754 * method.c (defaulted_late_check): Early return if the defaulted declaration does not match the expected signature. /testsuite 2017-09-30 Paolo Carlini PR c++/68754 * g++.dg/cpp1y/constexpr-68754.C: Move... * g++.dg/cpp0x/constexpr-68754.C: ... here, adjust. From-SVN: r253321 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/method.c | 8 +++++--- gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/g++.dg/cpp0x/constexpr-68754.C | 7 +++++++ gcc/testsuite/g++.dg/cpp1y/constexpr-68754.C | 7 ------- 5 files changed, 24 insertions(+), 10 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/constexpr-68754.C delete mode 100644 gcc/testsuite/g++.dg/cpp1y/constexpr-68754.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index a9ee9a5..4025cb0 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2017-09-30 Paolo Carlini + + PR c++/68754 + * method.c (defaulted_late_check): Early return if the defaulted + declaration does not match the expected signature. + 2017-09-29 Jakub Jelinek P0683R1 - default member initializers for bit-fields diff --git a/gcc/cp/method.c b/gcc/cp/method.c index b83a6f2..7788afb 100644 --- a/gcc/cp/method.c +++ b/gcc/cp/method.c @@ -2191,9 +2191,11 @@ defaulted_late_check (tree fn) || !compparms (TYPE_ARG_TYPES (TREE_TYPE (fn)), TYPE_ARG_TYPES (TREE_TYPE (implicit_fn)))) { - error ("defaulted declaration %q+D", fn); - error_at (DECL_SOURCE_LOCATION (fn), - "does not match expected signature %qD", implicit_fn); + error ("defaulted declaration %q+D does not match the " + "expected signature", fn); + inform (DECL_SOURCE_LOCATION (fn), + "expected signature: %qD", implicit_fn); + return; } if (DECL_DELETED_FN (implicit_fn)) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ebcfb1b..cd4688e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2017-09-30 Paolo Carlini + + PR c++/68754 + * g++.dg/cpp1y/constexpr-68754.C: Move... + * g++.dg/cpp0x/constexpr-68754.C: ... here, adjust. + 2017-09-30 Jakub Jelinek PR target/82361 diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-68754.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-68754.C new file mode 100644 index 0000000..643fa07 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-68754.C @@ -0,0 +1,7 @@ +// PR c++/68754 +// { dg-do compile { target c++11 } } + +struct base { }; +struct derived : base { + constexpr derived& operator=(derived const&) = default; // { dg-error "defaulted declaration" "" { target { ! c++14 } } } +}; diff --git a/gcc/testsuite/g++.dg/cpp1y/constexpr-68754.C b/gcc/testsuite/g++.dg/cpp1y/constexpr-68754.C deleted file mode 100644 index e72acb1..0000000 --- a/gcc/testsuite/g++.dg/cpp1y/constexpr-68754.C +++ /dev/null @@ -1,7 +0,0 @@ -// PR c++/68754 -// { dg-do compile { target c++14 } } - -struct base { }; -struct derived : base { - constexpr derived& operator=(derived const&) = default; -}; -- 2.7.4