diff options
| -rw-r--r-- | clang/lib/Sema/SemaExceptionSpec.cpp | 2 | ||||
| -rw-r--r-- | clang/test/CXX/basic/basic.stc/basic.stc.dynamic/p2-noexceptions.cpp | 2 | ||||
| -rw-r--r-- | clang/test/CXX/basic/basic.stc/basic.stc.dynamic/p2.cpp | 19 |
3 files changed, 19 insertions, 4 deletions
diff --git a/clang/lib/Sema/SemaExceptionSpec.cpp b/clang/lib/Sema/SemaExceptionSpec.cpp index 73b39cc550a..f8e75b2fe79 100644 --- a/clang/lib/Sema/SemaExceptionSpec.cpp +++ b/clang/lib/Sema/SemaExceptionSpec.cpp @@ -235,7 +235,7 @@ bool Sema::CheckEquivalentExceptionSpec(FunctionDecl *Old, FunctionDecl *New) { // If a declaration of a function has an implicit // exception-specification, other declarations of the function shall // not specify an exception-specification. - if (getLangOpts().CPlusPlus11 && + if (getLangOpts().CPlusPlus11 && getLangOpts().CXXExceptions && hasImplicitExceptionSpec(Old) != hasImplicitExceptionSpec(New)) { Diag(New->getLocation(), diag::ext_implicit_exception_spec_mismatch) << hasImplicitExceptionSpec(Old); diff --git a/clang/test/CXX/basic/basic.stc/basic.stc.dynamic/p2-noexceptions.cpp b/clang/test/CXX/basic/basic.stc/basic.stc.dynamic/p2-noexceptions.cpp index 9819ea0293f..41aeeee73ed 100644 --- a/clang/test/CXX/basic/basic.stc/basic.stc.dynamic/p2-noexceptions.cpp +++ b/clang/test/CXX/basic/basic.stc/basic.stc.dynamic/p2-noexceptions.cpp @@ -1,3 +1,5 @@ +// RUN: %clang_cc1 -fsyntax-only -verify -std=c++98 %s +// RUN: %clang_cc1 -fsyntax-only -verify -std=c++11 %s // RUN: %clang_cc1 -fsyntax-only -verify %s // expected-no-diagnostics namespace std { diff --git a/clang/test/CXX/basic/basic.stc/basic.stc.dynamic/p2.cpp b/clang/test/CXX/basic/basic.stc/basic.stc.dynamic/p2.cpp index 47b51585556..257aca1c3f7 100644 --- a/clang/test/CXX/basic/basic.stc/basic.stc.dynamic/p2.cpp +++ b/clang/test/CXX/basic/basic.stc/basic.stc.dynamic/p2.cpp @@ -1,3 +1,5 @@ +// RUN: %clang_cc1 -fsyntax-only -fexceptions -fcxx-exceptions -verify -std=c++98 %s +// RUN: %clang_cc1 -fsyntax-only -fexceptions -fcxx-exceptions -verify -std=c++11 %s // RUN: %clang_cc1 -fsyntax-only -fexceptions -fcxx-exceptions -verify %s int *use_new(int N) { if (N == 1) @@ -19,10 +21,21 @@ namespace std { typedef __SIZE_TYPE__ size_t; } -void* operator new(std::size_t) throw(std::bad_alloc); // expected-note{{previous declaration}} +void* operator new(std::size_t) throw(std::bad_alloc); +#if __cplusplus < 201103L +// expected-note@-2 {{previous declaration}} +#endif void* operator new[](std::size_t) throw(std::bad_alloc); void operator delete(void*) throw(); // expected-note{{previous declaration}} void operator delete[](void*) throw(); -void* operator new(std::size_t); // expected-warning{{'operator new' is missing exception specification 'throw(std::bad_alloc)'}} -void operator delete(void*); // expected-warning{{'operator delete' is missing exception specification 'throw()'}} +void* operator new(std::size_t); +#if __cplusplus < 201103L +// expected-warning@-2 {{'operator new' is missing exception specification 'throw(std::bad_alloc)'}} +#endif +void operator delete(void*); +#if __cplusplus < 201103L +// expected-warning@-2 {{'operator delete' is missing exception specification 'throw()'}} +#else +// expected-warning@-4 {{previously declared with an explicit exception specification redeclared with an implicit}} +#endif |
