[analyzer] Fix wrong builtin_*_overflow return type

[pskrgag]

builtin_*_overflow functions return _Bool according to [1]. BuiltinFunctionChecker was using makeTruthVal w/o specifying explicit type, which creates an int value, since it's the type of any compassion according to C standard.

Fix it by directly passing BoolTy to makeTruthVal

Closes: #111147

[1] https://clang.llvm.org/docs/LanguageExtensions.html#checked-arithmetic-builtins

[llvmbot]

@llvm/pr-subscribers-clang

@llvm/pr-subscribers-clang-static-analyzer-1

Author: Pavel Skripkin (pskrgag)

Changes

builtin_*_overflow functions return _Bool according to [1]. BuiltinFunctionChecker was using makeTruthVal for return type, which creates an int value, since it's the type of any compassion according to C standard.

Fix it by directly passing BoolTy to makeTruthVal

Closes: #111147

[1] https://clang.llvm.org/docs/LanguageExtensions.html#checked-arithmetic-builtins

---

Full diff: https://github.com/llvm/llvm-project/pull/111253.diff

2 Files Affected:

• (modified) clang/lib/StaticAnalyzer/Checkers/BuiltinFunctionChecker.cpp (+3-2)
• (modified) clang/test/Analysis/builtin_overflow.c (+10-1)

diff --git a/clang/lib/StaticAnalyzer/Checkers/BuiltinFunctionChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/BuiltinFunctionChecker.cpp
index 69d8e968283b37..d49f01898e2241 100644
--- a/clang/lib/StaticAnalyzer/Checkers/BuiltinFunctionChecker.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/BuiltinFunctionChecker.cpp
@@ -183,6 +183,7 @@ void BuiltinFunctionChecker::handleOverflowBuiltin(const CallEvent &Call,
   ProgramStateRef State = C.getState();
   SValBuilder &SVB = C.getSValBuilder();
   const Expr *CE = Call.getOriginExpr();
+  auto BoolTy = C.getASTContext().BoolTy;
 
   SVal Arg1 = Call.getArgSVal(0);
   SVal Arg2 = Call.getArgSVal(1);
@@ -194,7 +195,7 @@ void BuiltinFunctionChecker::handleOverflowBuiltin(const CallEvent &Call,
   auto [Overflow, NotOverflow] = checkOverflow(C, RetValMax, ResultType);
   if (NotOverflow) {
     ProgramStateRef StateNoOverflow =
-        State->BindExpr(CE, C.getLocationContext(), SVB.makeTruthVal(false));
+        State->BindExpr(CE, C.getLocationContext(), SVB.makeTruthVal(false, BoolTy));
 
     if (auto L = Call.getArgSVal(2).getAs<Loc>()) {
       StateNoOverflow =
@@ -213,7 +214,7 @@ void BuiltinFunctionChecker::handleOverflowBuiltin(const CallEvent &Call,
 
   if (Overflow) {
     C.addTransition(
-        State->BindExpr(CE, C.getLocationContext(), SVB.makeTruthVal(true)),
+        State->BindExpr(CE, C.getLocationContext(), SVB.makeTruthVal(true, BoolTy)),
         createBuiltinOverflowNoteTag(C));
   }
 }
diff --git a/clang/test/Analysis/builtin_overflow.c b/clang/test/Analysis/builtin_overflow.c
index 5c61795661d095..9d98ce7a1af45c 100644
--- a/clang/test/Analysis/builtin_overflow.c
+++ b/clang/test/Analysis/builtin_overflow.c
@@ -1,5 +1,5 @@
 // RUN: %clang_analyze_cc1 -triple x86_64-unknown-unknown -verify %s \
-// RUN:   -analyzer-checker=core,debug.ExprInspection
+// RUN:   -analyzer-checker=core,debug.ExprInspection,alpha.core.BoolAssignment
 
 #define __UINT_MAX__ (__INT_MAX__ * 2U + 1U)
 #define __INT_MIN__  (-__INT_MAX__ - 1)
@@ -155,3 +155,12 @@ void test_uadd_overflow_contraints(unsigned a, unsigned b)
      return;
    }
 }
+
+void test_bool_assign(void)
+{
+    int res;
+
+    // Reproduce issue from GH#111147. __builtin_*_overflow funcions
+    // should return _Bool, but not int.
+    _Bool ret = __builtin_mul_overflow(10, 20, &res); // no crash
+}

[github-actions]

✅ With the latest revision this PR passed the C/C++ code formatter.

[steakhal]

LGTM, thanks.

[pskrgag]

CI looks unrelated

bk;t=1728134304433�Failed Tests (1):

�_bk;t=1728134304433�  LLVM :: Transforms/InstCombine/and-or-icmps.ll

Should I re-trigger it just in case?

[NagyDonat]

@pskrgag Thanks for fixing this issue quickly! 😄