Check that the function being overridden is virtual.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@71802 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 1c464d1..feb9595 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -2125,7 +2125,7 @@
SourceRange(D.getDeclSpec().getVirtualSpecLoc()));
} else {
// Okay: Add virtual to the method.
- cast<CXXMethodDecl>(NewFD)->setVirtual();
+ cast<CXXMethodDecl>(NewFD)->setVirtualAsWritten(true);
CXXRecordDecl *CurClass = cast<CXXRecordDecl>(DC);
CurClass->setAggregate(false);
CurClass->setPOD(false);
@@ -2152,6 +2152,8 @@
// FIXME: Is this OK? Should it be done by LookupInBases?
if (IsOverload(NewMD, OldMD, MatchedDecl))
continue;
+ if (!OldMD->isVirtual())
+ continue;
if (!CheckOverridingFunctionReturnType(NewMD, OldMD)) {
// FIXME: Add OldMD to the list of methods NewMD overrides.
@@ -2490,7 +2492,7 @@
Expr *Init = static_cast<Expr *>(init.get());
if ((IL = dyn_cast<IntegerLiteral>(Init)) && IL->getValue() == 0 &&
Context.getCanonicalType(IL->getType()) == Context.IntTy) {
- if (Method->isVirtual()) {
+ if (Method->isVirtualAsWritten()) {
Method->setPure();
// A class is abstract if at least one function is pure virtual.