Skip to content

Commit 9e270dc

Browse files
committed
Use isLifetimeBorrowed()
1 parent 0a7f693 commit 9e270dc

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

lib/valueflow.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2536,14 +2536,14 @@ static void valueFlowLifetimeFunction(Token *tok, const TokenList &tokenlist, Er
25362536
}
25372537
if (Function::returnsReference(f))
25382538
return;
2539-
if (astIsContainerString(tok->next()) && !astIsContainerView(tok->next()))
2540-
return;
25412539
std::vector<const Token*> returns = Function::findReturns(f);
25422540
const bool inconclusive = returns.size() > 1;
25432541
bool update = false;
25442542
for (const Token* returnTok : returns) {
25452543
if (returnTok == tok)
25462544
continue;
2545+
if (!ValueFlow::isLifetimeBorrowed(returnTok, settings))
2546+
return;
25472547
const Variable *returnVar = ValueFlow::getLifetimeVariable(returnTok, settings);
25482548
if (returnVar && returnVar->isArgument() && (returnVar->isConst() || !isVariableChanged(returnVar, settings))) {
25492549
LifetimeStore ls = LifetimeStore::fromFunctionArg(f, tok, returnVar, tokenlist, settings, errorLogger);

0 commit comments

Comments
 (0)