2 files changed, 36 insertions, 0 deletions

diff --git a/clang-tools-extra/clang-tidy/bugprone/StringIntegerAssignmentCheck.cpp b/clang-tools-extra/clang-tidy/bugprone/StringIntegerAssignmentCheck.cpp
index 4288c2dbba0..389ddc1caf3 100644
--- a/clang-tools-extra/clang-tidy/bugprone/StringIntegerAssignmentCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/StringIntegerAssignmentCheck.cpp
@@ -45,11 +45,40 @@ void StringIntegerAssignmentCheck::registerMatchers(MatchFinder *Finder) {
       this);
 }
 
+static bool isLikelyCharExpression(const Expr *Argument,
+                                   const ASTContext &Ctx) {
+  const auto *BinOp = dyn_cast<BinaryOperator>(Argument);
+  if (!BinOp)
+    return false;
+  const auto *LHS = BinOp->getLHS()->IgnoreParenImpCasts();
+  const auto *RHS = BinOp->getRHS()->IgnoreParenImpCasts();
+  // <expr> & <mask>, 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;
+  // <char literal> + (<expr> % <mod>), where <base> is a char literal.
+  const auto IsCharPlusModExpr = [](const Expr *L, const Expr *R) {
+    const auto *ROp = dyn_cast<BinaryOperator>(R);
+    return ROp && ROp->getOpcode() == BO_Rem && isa<CharacterLiteral>(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>("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 "
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-string-integer-assignment.cpp b/clang-tools-extra/test/clang-tidy/bugprone-string-integer-assignment.cpp
index 2b73f89bf12..dbf3a5c5e60 100644
--- a/clang-tools-extra/test/clang-tidy/bugprone-string-integer-assignment.cpp
+++ b/clang-tools-extra/test/clang-tidy/bugprone-string-integer-assignment.cpp
@@ -59,4 +59,11 @@ int main() {
   s += toupper(x);
   s += tolower(x);
   s += std::tolower(x);
+
+  // Likely character expressions.
+  s += x & 0xff;
+  s += 0xff & x;
+
+  s += 'a' + (x % 26);
+  s += (x % 10) + 'b';
 }