From: Erich Keane Date: Fri, 31 May 2019 15:56:27 +0000 (+0000) Subject: Suppress nothrow/exception spec conflict warning when ES is parsed. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b1e7e8246219d59b7ba0dbaf613b1eb366918d79;p=clang Suppress nothrow/exception spec conflict warning when ES is parsed. The previously added warning ended up causing false positives when nothrow was used on member functions, where the exception specification wasn't yet parsed. So, throw() and noexcept(true) both were incorrectly warning. There doesn't seem to be a good way to force these to be parsed to identify which they are (and likely should not be), so suppress the warning. For now, unevaluated/uninstantiated are left as warnings as I am not creative enough to find a reproducer that causes a false positive for either. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@362236 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Sema/SemaType.cpp b/lib/Sema/SemaType.cpp index eac7c44c76..43ac435a82 100644 --- a/lib/Sema/SemaType.cpp +++ b/lib/Sema/SemaType.cpp @@ -6976,7 +6976,10 @@ static bool handleFunctionTypeAttr(TypeProcessingState &state, ParsedAttr &attr, case EST_BasicNoexcept: case EST_NoexceptTrue: case EST_NoThrow: + case EST_Unparsed: // Exception spec doesn't conflict with nothrow, so don't warn. + // Unparsed is included in this, since method signatures aren't parsed + // until after the fact. break; case EST_Dynamic: @@ -6985,7 +6988,6 @@ static bool handleFunctionTypeAttr(TypeProcessingState &state, ParsedAttr &attr, case EST_DependentNoexcept: case EST_Unevaluated: case EST_Uninstantiated: - case EST_Unparsed: S.Diag(attr.getLoc(), diag::warn_nothrow_attribute_ignored); break; } diff --git a/test/SemaCXX/nothrow-vs-exception-specs.cpp b/test/SemaCXX/nothrow-vs-exception-specs.cpp index f9bc90e30e..563f604067 100644 --- a/test/SemaCXX/nothrow-vs-exception-specs.cpp +++ b/test/SemaCXX/nothrow-vs-exception-specs.cpp @@ -53,3 +53,16 @@ __declspec(nothrow) void foo4() noexcept(noexcept(foo1())); __declspec(nothrow) void foo5() noexcept(noexcept(foo2())); // expected-warning@+1{{'nothrow' attribute conflicts with exception specification; attribute ignored}} __declspec(nothrow) void foo6() noexcept(noexcept(foo3())); + +// FIXME: It would be nice to be able to warn on these, however at the time we +// evaluate the nothrow, these have yet to be parsed, so the data is not yet +// there. +struct S { + __declspec(nothrow) void f1(); +#ifndef CPP17 + __declspec(nothrow) void f2() throw(); + __declspec(nothrow) void f3() throw(int); +#endif + __declspec(nothrow) void f4() noexcept(true); + __declspec(nothrow) void f5() noexcept(false); +};