r334065 - [Analyzer] Fix Z3ConstraintManager crash (PR37646)

[Vlad Tsyrklevich via cfe-commits]

Author: vlad.tsyrklevich
Date: Tue Jun  5 23:09:02 2018
New Revision: 334065

URL: http://llvm.org/viewvc/llvm-project?rev=334065&view=rev
Log:
[Analyzer] Fix Z3ConstraintManager crash (PR37646)

Summary:
Fix another Z3ConstraintManager crash, use fixAPSInt() to extend a
boolean APSInt.

Reviewers: george.karpenkov, NoQ, ddcc

Reviewed By: george.karpenkov

Subscribers: xazax.hun, szepet, a.sidorin, cfe-commits

Differential Revision: https://reviews.llvm.org/D47617

Added:
    cfe/trunk/test/Analysis/z3/
    cfe/trunk/test/Analysis/z3/apsint.c
Removed:
    cfe/trunk/test/Analysis/apsint.c
Modified:
    cfe/trunk/lib/StaticAnalyzer/Core/Z3ConstraintManager.cpp

Modified: cfe/trunk/lib/StaticAnalyzer/Core/Z3ConstraintManager.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/Z3ConstraintManager.cpp?rev=334065&r1=334064&r2=334065&view=diff
==============================================================================
--- cfe/trunk/lib/StaticAnalyzer/Core/Z3ConstraintManager.cpp (original)
+++ cfe/trunk/lib/StaticAnalyzer/Core/Z3ConstraintManager.cpp Tue Jun  5 23:09:02 2018
@@ -1231,8 +1231,10 @@ const llvm::APSInt *Z3ConstraintManager:
     if (!LHS || !RHS)
       return nullptr;
 
-    llvm::APSInt ConvertedLHS = *LHS, ConvertedRHS = *RHS;
-    QualType LTy = getAPSIntType(*LHS), RTy = getAPSIntType(*RHS);
+    llvm::APSInt ConvertedLHS, ConvertedRHS;
+    QualType LTy, RTy;
+    std::tie(ConvertedLHS, LTy) = fixAPSInt(*LHS);
+    std::tie(ConvertedRHS, RTy) = fixAPSInt(*RHS);
     doIntTypeConversion<llvm::APSInt, Z3ConstraintManager::castAPSInt>(
         ConvertedLHS, LTy, ConvertedRHS, RTy);
     return BVF.evalAPSInt(BSE->getOpcode(), ConvertedLHS, ConvertedRHS);

Removed: cfe/trunk/test/Analysis/apsint.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/apsint.c?rev=334064&view=auto
==============================================================================
--- cfe/trunk/test/Analysis/apsint.c (original)
+++ cfe/trunk/test/Analysis/apsint.c (removed)
@@ -1,7 +0,0 @@
-// REQUIRES: z3
-// RUN: %clang_analyze_cc1 -triple x86_64-unknown-linux-gnu -analyzer-checker=core -verify %s
-// expected-no-diagnostics
-
-_Bool a() {
-  return !({ a(); });
-}

Added: cfe/trunk/test/Analysis/z3/apsint.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/z3/apsint.c?rev=334065&view=auto
==============================================================================
--- cfe/trunk/test/Analysis/z3/apsint.c (added)
+++ cfe/trunk/test/Analysis/z3/apsint.c Tue Jun  5 23:09:02 2018
@@ -0,0 +1,16 @@
+// RUN: %clang_analyze_cc1 -triple x86_64-unknown-linux-gnu -analyzer-checker=core -verify %s
+// expected-no-diagnostics
+
+// https://bugs.llvm.org/show_bug.cgi?id=37622
+_Bool a() {
+  return !({ a(); });
+}
+
+// https://bugs.llvm.org/show_bug.cgi?id=37646
+_Bool b;
+void c() {
+  _Bool a = b | 0;
+  for (;;)
+    if (a)
+      ;
+}