diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst index 903ad19d0b845..1bb842f9b8888 100644 --- a/clang/docs/ReleaseNotes.rst +++ b/clang/docs/ReleaseNotes.rst @@ -348,6 +348,9 @@ Improvements to Clang's diagnostics | ~~~~~~~~~^~~~~~~~ - Clang now always diagnoses when using non-standard layout types in ``offsetof`` . (`#64619: `_) +- Clang now diagnoses redefined defaulted constructor when redefined + defaulted constructor with different exception specs. + (`#69094: `_) - Clang now diagnoses use of variable-length arrays in C++ by default (and under ``-Wall`` in GNU++ mode). This is an extension supported by Clang and GCC, but is very easy to accidentally use without realizing it's a diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index b363b0db79f16..c4979b51e68f5 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -3922,18 +3922,6 @@ bool Sema::MergeFunctionDecl(FunctionDecl *New, NamedDecl *&OldD, Scope *S, } if (getLangOpts().CPlusPlus) { - // C++1z [over.load]p2 - // Certain function declarations cannot be overloaded: - // -- Function declarations that differ only in the return type, - // the exception specification, or both cannot be overloaded. - - // Check the exception specifications match. This may recompute the type of - // both Old and New if it resolved exception specifications, so grab the - // types again after this. Because this updates the type, we do this before - // any of the other checks below, which may update the "de facto" NewQType - // but do not necessarily update the type of New. - if (CheckEquivalentExceptionSpec(Old, New)) - return true; OldQType = Context.getCanonicalType(Old->getType()); NewQType = Context.getCanonicalType(New->getType()); @@ -4055,6 +4043,19 @@ bool Sema::MergeFunctionDecl(FunctionDecl *New, NamedDecl *&OldD, Scope *S, } } + // C++1z [over.load]p2 + // Certain function declarations cannot be overloaded: + // -- Function declarations that differ only in the return type, + // the exception specification, or both cannot be overloaded. + + // Check the exception specifications match. This may recompute the type of + // both Old and New if it resolved exception specifications, so grab the + // types again after this. Because this updates the type, we do this before + // any of the other checks below, which may update the "de facto" NewQType + // but do not necessarily update the type of New. + if (CheckEquivalentExceptionSpec(Old, New)) + return true; + // C++11 [dcl.attr.noreturn]p1: // The first declaration of a function shall specify the noreturn // attribute if any declaration of that function specifies the noreturn diff --git a/clang/test/SemaCXX/diagnose-prioritiy-exception-redefining.cpp b/clang/test/SemaCXX/diagnose-prioritiy-exception-redefining.cpp new file mode 100644 index 0000000000000..ad025bf041ce5 --- /dev/null +++ b/clang/test/SemaCXX/diagnose-prioritiy-exception-redefining.cpp @@ -0,0 +1,9 @@ +// RUN: %clang_cc1 -fsyntax-only -verify -fcxx-exceptions -std=c++11 %s + +struct ExplicitlySpecialMethod { + ExplicitlySpecialMethod() = default; +}; +ExplicitlySpecialMethod::ExplicitlySpecialMethod() {} // expected-error{{definition of explicitly defaulted default constructor}} + +struct ImplicitlySpecialMethod {}; +ImplicitlySpecialMethod::ImplicitlySpecialMethod() {} // expected-error{{definition of implicitly declared default constructor}}