diff options
| -rw-r--r-- | clang/lib/Sema/SemaExceptionSpec.cpp | 10 | ||||
| -rw-r--r-- | clang/test/CXX/except/except.spec/p3.cpp | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/clang/lib/Sema/SemaExceptionSpec.cpp b/clang/lib/Sema/SemaExceptionSpec.cpp index 1d21b9760c7..490934c4b04 100644 --- a/clang/lib/Sema/SemaExceptionSpec.cpp +++ b/clang/lib/Sema/SemaExceptionSpec.cpp @@ -396,14 +396,14 @@ bool Sema::CheckEquivalentExceptionSpec(const PartialDiagnostic &DiagID, if (Name && Name->getName() == "bad_alloc") { // It's called bad_alloc, but is it in std? DeclContext* DC = ExRecord->getDeclContext(); - while (DC && !isa<NamespaceDecl>(DC)) - DC = DC->getParent(); - if (DC) { - NamespaceDecl* NS = cast<NamespaceDecl>(DC); + DC = DC->getEnclosingNamespaceContext(); + if (NamespaceDecl* NS = dyn_cast<NamespaceDecl>(DC)) { IdentifierInfo* NSName = NS->getIdentifier(); + DC = DC->getParent(); if (NSName && NSName->getName() == "std" && - isa<TranslationUnitDecl>(NS->getParent())) + DC->getEnclosingNamespaceContext()->isTranslationUnit()) { return false; + } } } } diff --git a/clang/test/CXX/except/except.spec/p3.cpp b/clang/test/CXX/except/except.spec/p3.cpp index 10e027b719a..09b1a4e102f 100644 --- a/clang/test/CXX/except/except.spec/p3.cpp +++ b/clang/test/CXX/except/except.spec/p3.cpp @@ -97,9 +97,9 @@ extern void (*r21)() noexcept(true); // expected-error {{does not match}} // As a very special workaround, we allow operator new to match no spec // with a throw(bad_alloc) spec, because C++0x makes an incompatible change // here. -namespace std { class bad_alloc {}; } +extern "C++" { namespace std { class bad_alloc {}; } } void* operator new(unsigned long) throw(std::bad_alloc); void* operator new(unsigned long); -void* operator new[](unsigned long) throw(std::bad_alloc); void* operator new[](unsigned long); +void* operator new[](unsigned long) throw(std::bad_alloc); |
