diff --git a/clang-tools-extra/clang-tidy/readability/ConstReturnTypeCheck.cpp b/clang-tools-extra/clang-tidy/readability/ConstReturnTypeCheck.cpp --- a/clang-tools-extra/clang-tidy/readability/ConstReturnTypeCheck.cpp +++ b/clang-tools-extra/clang-tidy/readability/ConstReturnTypeCheck.cpp @@ -97,7 +97,9 @@ // Find all function definitions for which the return types are `const` // qualified. Finder->addMatcher( - functionDecl(returns(isConstQualified()), isDefinition()).bind("func"), + functionDecl(returns(isConstQualified()), + anyOf(isDefinition(), cxxMethodDecl(isPure()))) + .bind("func"), this); } @@ -115,6 +117,12 @@ << Def->getReturnType(); if (CR.ConstRange.isValid()) Diagnostic << CR.ConstRange; + + // Do not propose fixes for virtual function. + const auto *Method = dyn_cast(Def); + if (Method && Method->isVirtual()) + return; + for (auto &Hint : CR.Hints) Diagnostic << Hint; } diff --git a/clang-tools-extra/docs/ReleaseNotes.rst b/clang-tools-extra/docs/ReleaseNotes.rst --- a/clang-tools-extra/docs/ReleaseNotes.rst +++ b/clang-tools-extra/docs/ReleaseNotes.rst @@ -112,6 +112,10 @@ - Fixed a false positive in :doc:`readability-non-const-parameter ` when the parameter is referenced by an lvalue +- Fixed a crash in :doc:`readability-const-return-type + ` when a pure virtual function + overrided has a const return type. Removed the fix for a virtual function. + Removed checks ^^^^^^^^^^^^^^ diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability-const-return-type.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-const-return-type.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability-const-return-type.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability-const-return-type.cpp @@ -271,3 +271,17 @@ int **const * n_multiple_ptr(); int *const & n_pointer_ref(); + +class PVBase { +public: + virtual const int getC() = 0; + // CHECK-MESSAGES: [[@LINE-1]]:3: warning: return type 'const int' is 'const'-qualified at the top level, which may reduce code readability without improving const correctness + // CHECK-NOT-FIXES: virtual int getC() = 0; +}; + +class PVDerive : public PVBase { +public: + const int getC() { return 1; } + // CHECK-MESSAGES: [[@LINE-1]]:3: warning: return type 'const int' is 'const'-qualified at the top level, which may reduce code readability without improving const correctness + // CHECK-NOT-FIXES: int getC() { return 1; } +};