Index: clang-tidy/bugprone/StringIntegerAssignmentCheck.cpp =================================================================== --- clang-tidy/bugprone/StringIntegerAssignmentCheck.cpp +++ clang-tidy/bugprone/StringIntegerAssignmentCheck.cpp @@ -35,11 +35,44 @@ this); } +static bool isLikelyCharExpression(const Expr *Argument, + const ASTContext &Ctx) { + const auto *BinOp = dyn_cast(Argument); + if (!BinOp) { + return false; + } + const auto *LHS = BinOp->getLHS()->IgnoreParenImpCasts(); + const auto *RHS = BinOp->getRHS()->IgnoreParenImpCasts(); + // & , mask is a compile time constant. + Expr::EvalResult RHSVal; + if (BinOp->getOpcode() == BO_And && + (RHS->EvaluateAsInt(RHSVal, Ctx, Expr::SE_AllowSideEffects) || + LHS->EvaluateAsInt(RHSVal, Ctx, Expr::SE_AllowSideEffects))) { + return true; + } + // + ( % ), where is a char literal. + const auto IsCharPlusModExpr = [](const Expr *L, const Expr *R) { + const auto *ROp = dyn_cast(R); + return ROp && ROp->getOpcode() == BO_Rem && isa(L); + }; + if (BinOp->getOpcode() == BO_Add) { + if (IsCharPlusModExpr(LHS, RHS) || IsCharPlusModExpr(RHS, LHS)) { + return true; + } + } + return false; +} + void StringIntegerAssignmentCheck::check( const MatchFinder::MatchResult &Result) { const auto *Argument = Result.Nodes.getNodeAs("expr"); SourceLocation Loc = Argument->getBeginLoc(); + // Try to detect a few common expressions to reduce false positives. + if (isLikelyCharExpression(Argument, *Result.Context)) { + return; + } + auto Diag = diag(Loc, "an integer is interpreted as a character code when assigning " "it to a string; if this is intended, cast the integer to the " Index: test/clang-tidy/bugprone-string-integer-assignment.cpp =================================================================== --- test/clang-tidy/bugprone-string-integer-assignment.cpp +++ test/clang-tidy/bugprone-string-integer-assignment.cpp @@ -50,4 +50,8 @@ // CHECK-MESSAGES: :[[@LINE-1]]:8: warning: an integer is interpreted as a chara // CHECK-FIXES: {{^}} as = 6;{{$}} + // Likely character expressions. + s += x & 0xff; + + s += 'a' + (x % 26); }