Skip to content

Commit 5aeb7f2

Browse files
committed
[squash-this] merge if statements
1 parent d936165 commit 5aeb7f2

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

clang-tools-extra/clang-tidy/bugprone/NotNullTerminatedResultCheck.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ static unsigned getLength(const Expr *E,
6969
if (const auto *LengthDRE = dyn_cast<DeclRefExpr>(E))
7070
if (const auto *LengthVD = dyn_cast<VarDecl>(LengthDRE->getDecl()))
7171
if (!isa<ParmVarDecl>(LengthVD))
72-
if (const Expr *LengthInit = LengthVD->getInit())
73-
if (!LengthInit->isValueDependent()) {
74-
Expr::EvalResult Length;
75-
if (LengthInit->EvaluateAsInt(Length, *Result.Context))
76-
return Length.Val.getInt().getZExtValue();
77-
}
72+
if (const Expr *LengthInit = LengthVD->getInit();
73+
LengthInit && !LengthInit->isValueDependent()) {
74+
Expr::EvalResult Length;
75+
if (LengthInit->EvaluateAsInt(Length, *Result.Context))
76+
return Length.Val.getInt().getZExtValue();
77+
}
7878

7979
if (const auto *LengthIL = dyn_cast<IntegerLiteral>(E))
8080
return LengthIL->getValue().getZExtValue();

0 commit comments

Comments
 (0)