Revert "Fix missed exception spec checks and crashes"
The changes caused the sanitizer bot to hang:
http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux/builds/2311
Needs investigation.
This reverts commit r192914.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@192921 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp
index 0355a98..bd864b3 100644
--- a/lib/Sema/SemaDeclCXX.cpp
+++ b/lib/Sema/SemaDeclCXX.cpp
@@ -4864,27 +4864,14 @@
SpecifiedType, MD->getLocation());
}
-void Sema::CheckDelayedMemberExceptionSpecs() {
- // Perform any deferred checking of exception specifications for virtual
- // destructors.
- while (!DelayedDestructorExceptionSpecChecks.empty()) {
- std::pair<const CXXDestructorDecl *, const CXXDestructorDecl *> Check =
- DelayedDestructorExceptionSpecChecks.pop_back_val();
- const CXXDestructorDecl *Dtor = Check.first;
- assert(!Dtor->getParent()->isDependentType() &&
- "Should not ever add destructors of templates into the list.");
- CheckOverridingFunctionExceptionSpec(Dtor, Check.second);
- }
+void Sema::CheckDelayedExplicitlyDefaultedMemberExceptionSpecs() {
+ for (unsigned I = 0, N = DelayedDefaultedMemberExceptionSpecs.size();
+ I != N; ++I)
+ CheckExplicitlyDefaultedMemberExceptionSpec(
+ DelayedDefaultedMemberExceptionSpecs[I].first,
+ DelayedDefaultedMemberExceptionSpecs[I].second);
- // Check that any explicitly-defaulted methods have exception specifications
- // compatible with their implicit exception specifications.
- while (!DelayedDefaultedMemberExceptionSpecs.empty()) {
- std::pair<CXXMethodDecl *, const FunctionProtoType *> Spec =
- DelayedDefaultedMemberExceptionSpecs.pop_back_val();
- CheckExplicitlyDefaultedMemberExceptionSpec(Spec.first, Spec.second);
- }
-
- assert(DelayedDestructorExceptionSpecChecks.empty());
+ DelayedDefaultedMemberExceptionSpecs.clear();
}
namespace {
@@ -8195,8 +8182,9 @@
}
void Sema::ActOnFinishDelayedMemberInitializers(Decl *D) {
- // Perform any delayed checks on exception specifications.
- CheckDelayedMemberExceptionSpecs();
+ // Check that any explicitly-defaulted methods have exception specifications
+ // compatible with their implicit exception specifications.
+ CheckDelayedExplicitlyDefaultedMemberExceptionSpecs();
// Once all the member initializers are processed, perform checks to see if
// any unintialized use is happeneing.
@@ -8719,11 +8707,23 @@
// If the context is an invalid C++ class, just suppress these checks.
if (CXXRecordDecl *Record = dyn_cast<CXXRecordDecl>(CurContext)) {
if (Record->isInvalidDecl()) {
- DelayedDefaultedMemberExceptionSpecs.clear();
DelayedDestructorExceptionSpecChecks.clear();
return;
}
}
+
+ // Perform any deferred checking of exception specifications for virtual
+ // destructors.
+ for (unsigned i = 0, e = DelayedDestructorExceptionSpecChecks.size();
+ i != e; ++i) {
+ const CXXDestructorDecl *Dtor =
+ DelayedDestructorExceptionSpecChecks[i].first;
+ assert(!Dtor->getParent()->isDependentType() &&
+ "Should not ever add destructors of templates into the list.");
+ CheckOverridingFunctionExceptionSpec(Dtor,
+ DelayedDestructorExceptionSpecChecks[i].second);
+ }
+ DelayedDestructorExceptionSpecChecks.clear();
}
void Sema::AdjustDestructorExceptionSpec(CXXRecordDecl *ClassDecl,