Index: clang-tools-extra/clang-tidy/bugprone/BranchCloneCheck.cpp =================================================================== --- clang-tools-extra/clang-tidy/bugprone/BranchCloneCheck.cpp +++ clang-tools-extra/clang-tidy/bugprone/BranchCloneCheck.cpp @@ -19,6 +19,17 @@ /// Returns true when the statements are Type I clones of each other. static bool areStatementsIdentical(const Stmt *LHS, const Stmt *RHS, const ASTContext &Context) { + if (isa(LHS) && isa(RHS)) { + // If we have errors in expressions, we will be unable + // to accurately profile and compute hashes for each + // of the left and right statements. + const Expr *LHSExpr = llvm::dyn_cast(LHS); + const Expr *RHSExpr = llvm::dyn_cast(RHS); + if (LHSExpr->containsErrors() && RHSExpr->containsErrors()) { + return false; + } + } + llvm::FoldingSetNodeID DataLHS, DataRHS; LHS->Profile(DataLHS, Context, false); RHS->Profile(DataRHS, Context, false); Index: clang-tools-extra/docs/ReleaseNotes.rst =================================================================== --- clang-tools-extra/docs/ReleaseNotes.rst +++ clang-tools-extra/docs/ReleaseNotes.rst @@ -218,6 +218,10 @@ - Don't emit an erroneous warning on self-moves. +- Fixed a false positive in :doc:`bugprone-branch-clone + ` when the branches + involve unknown expressions. + Removed checks ^^^^^^^^^^^^^^ Index: clang-tools-extra/test/clang-tidy/checkers/bugprone-branch-clone.cpp =================================================================== --- clang-tools-extra/test/clang-tidy/checkers/bugprone-branch-clone.cpp +++ clang-tools-extra/test/clang-tidy/checkers/bugprone-branch-clone.cpp @@ -191,6 +191,16 @@ return a + b * c; } +// Unknown expressions are ignored +int test_basic18() { + if (unknown_expression_1) { + function1(unknown_expression_1); + } + else { + function2(unknown_expression_2); + } +} + //=========--------------------==========// #define PASTE_CODE(x) x