commit 02df2e08720f26f93130c48ec7a14e82e86062fb
author Aaron Ballman <aaron@aaronballman.com> Sun Dec 09 17:45:41 2012 +0000
committer Aaron Ballman <aaron@aaronballman.com> Sun Dec 09 17:45:41 2012 +0000
tree 2b9b1db7fffa7a9b5f3b6949123e5047c29b2ae8
parent c11b91ec18e97a6474baf7626c3348223837b93c

Virtual method overrides can no longer have mismatched calling conventions.  This fixes PR14339.

llvm-svn: 169705

clang/lib/Sema/SemaDecl.cpp

diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index be30053..aa0b41b 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -4846,6 +4846,7 @@
       if (CXXMethodDecl *OldMD = dyn_cast<CXXMethodDecl>(*I)) {
         MD->addOverriddenMethod(OldMD->getCanonicalDecl());
         if (!CheckOverridingFunctionReturnType(MD, OldMD) &&
+            !CheckOverridingFunctionAttributes(MD, OldMD) &&
             !CheckOverridingFunctionExceptionSpec(MD, OldMD) &&
             !CheckIfOverriddenFunctionIsMarkedFinal(MD, OldMD)) {
           hasDeletedOverridenMethods |= OldMD->isDeleted();