aboutsummaryrefslogtreecommitdiff
path: root/lib/Sema/SemaDecl.cpp
diff options
context:
space:
mode:
authorSebastian Redl <sebastian.redl@getdesigned.at>2011-05-19 16:25:27 +0000
committerSebastian Redl <sebastian.redl@getdesigned.at>2011-05-19 16:25:27 +0000
commit42bef03a0f0462a95eb66b9e63feab0bf596134d (patch)
tree37b94f470bc30e945310a891cd642598ceab7720 /lib/Sema/SemaDecl.cpp
parentde5c048fedb81f9b91c80cee1e5f4afd551dadd6 (diff)
Fix PR9941 again, this time for templates.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@131640 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaDecl.cpp')
-rw-r--r--lib/Sema/SemaDecl.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index fd28f2b6ee..fcff0b8ea0 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -8200,8 +8200,10 @@ void Sema::ActOnFields(Scope* S,
const CXXDestructorDecl *Dtor =
DelayedDestructorExceptionSpecChecks.back().first;
if (Dtor->getParent() == Record) {
- CheckOverridingFunctionExceptionSpec(Dtor,
- DelayedDestructorExceptionSpecChecks.back().second);
+ // Don't check if we're a template. The spec hasn't been adjusted.
+ if (!Dtor->getParent()->isDependentType())
+ CheckOverridingFunctionExceptionSpec(Dtor,
+ DelayedDestructorExceptionSpecChecks.back().second);
DelayedDestructorExceptionSpecChecks.pop_back();
}
}