From f2a2e338ffecff485893425b819e96c65aced043 Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Thu, 14 May 2009 01:09:04 +0000 Subject: Add return type checking for overriding virtual functions. We currently don't check covariance but that's next. llvm-svn: 71759 --- clang/lib/Sema/SemaDeclCXX.cpp | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'clang/lib/Sema/SemaDeclCXX.cpp') diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp index 726080b7ff6..bdd3cc2be14 100644 --- a/clang/lib/Sema/SemaDeclCXX.cpp +++ b/clang/lib/Sema/SemaDeclCXX.cpp @@ -2688,3 +2688,25 @@ void Sema::DiagnoseReturnInConstructorExceptionHandler(CXXTryStmt *TryBlock) { SearchForReturnInStmt(*this, Handler); } } + +bool Sema::CheckOverridingFunctionReturnType(const CXXMethodDecl *New, + const CXXMethodDecl *Old) { + QualType NewTy = New->getType()->getAsFunctionType()->getResultType(); + QualType OldTy = Old->getType()->getAsFunctionType()->getResultType(); + + QualType CNewTy = Context.getCanonicalType(NewTy); + QualType COldTy = Context.getCanonicalType(OldTy); + + if (CNewTy == COldTy && + CNewTy.getCVRQualifiers() == COldTy.getCVRQualifiers()) + return false; + + // FIXME: Check covariance. + + Diag(New->getLocation(), + diag::err_different_return_type_for_overriding_virtual_function) + << New->getDeclName() << NewTy << OldTy; + Diag(Old->getLocation(), diag::note_overridden_virtual_function); + + return true; +} -- cgit v1.2.3