From b7e6af603620aaf593bbfb8ddad1d9e88dea73af Mon Sep 17 00:00:00 2001 From: chrchr-github Date: Mon, 8 Apr 2024 22:54:55 +0200 Subject: [PATCH] performance, simplify --- lib/checkclass.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp index 73883116ce4..25314d6be4f 100644 --- a/lib/checkclass.cpp +++ b/lib/checkclass.cpp @@ -3305,6 +3305,8 @@ void CheckClass::checkUselessOverride() } static const Variable* getSingleReturnVar(const Scope* scope) { + if (!scope) + return nullptr; const Token* const start = scope->bodyStart->next(); const Token* const end = Token::findsimplematch(start, ";", 1, scope->bodyEnd); if (!end || end->next() != scope->bodyEnd) @@ -3323,8 +3325,6 @@ void CheckClass::checkReturnByReference() for (const Scope* classScope : mSymbolDatabase->classAndStructScopes) { for (const Function& func : classScope->functionList) { - if (!func.functionScope) - continue; if (Function::returnsPointer(&func) || Function::returnsReference(&func) || Function::returnsStandardType(&func)) continue; if (const Variable* var = getSingleReturnVar(func.functionScope)) { @@ -3349,7 +3349,7 @@ void CheckClass::returnByReferenceError(const Function* func, const Variable* va { const Token* tok = func ? func->tokenDef : nullptr; const std::string message = "Function '" + (func ? func->name() : "") + "()' should return member '" + (var ? var->name() : "") + "' by const reference."; - reportError(tok, Severity::style, "returnByReference", message); + reportError(tok, Severity::performance, "returnByReference", message); } void CheckClass::checkThisUseAfterFree()