Address latest round of comments, rebase to latest origin/main

Author: einvbri

clang/include/clang/StaticAnalyzer/Core/PathSensitive/SMTConv.h

@@ -572,15 +572,16 @@ class SMTConv {
   // TODO: Refactor to put elsewhere
   static inline QualType getAPSIntType(ASTContext &Ctx,
                                        const llvm::APSInt &Int) {
-    QualType Ty = Ctx.getIntTypeForBitwidth(Int.getBitWidth(), Int.isSigned());
+    QualType Ty;
+    if (!(Ty = Ctx.getIntTypeForBitwidth(Int.getBitWidth(), Int.isSigned()))
+             .isNull())
+      return Ty;
     // If Ty is Null, could be because the original type was a _BitInt.
     // Get the bit size and round up to next power of 2, max char size
-    if (Ty.isNull()) {
-      unsigned CharTypeSize = Ctx.getTypeSize(Ctx.CharTy);
-      unsigned Pow2DestWidth =
-          std::max(llvm::bit_ceil(Int.getBitWidth()), CharTypeSize);
-      Ty = Ctx.getIntTypeForBitwidth(Pow2DestWidth, Int.isSigned());
-    }
+    unsigned CharTypeSize = Ctx.getTypeSize(Ctx.CharTy);
+    unsigned Pow2DestWidth =
+        std::max(llvm::bit_ceil(Int.getBitWidth()), CharTypeSize);
+    Ty = Ctx.getIntTypeForBitwidth(Pow2DestWidth, Int.isSigned());
     return Ty;
   }
 
@@ -594,15 +595,12 @@ class SMTConv {
     // FIXME: This should be a cast from a 1-bit integer type to a boolean type,
     // but the former is not available in Clang. Instead, extend the APSInt
     // directly.
-    if (APSIntBitwidth == 1 && Ty.isNull()) {
-      NewInt = Int.extend(Ctx.getTypeSize(Ctx.BoolTy));
-      Ty = getAPSIntType(Ctx, NewInt);
-    } else if (!llvm::isPowerOf2_32(APSIntBitwidth) && !Ty.isNull()) {
-      NewInt = Int.extend(Ctx.getTypeSize(Ty));
-    } else
-      NewInt = Int;
-
-    return std::make_pair(NewInt, Ty);
+    if (APSIntBitwidth == 1 && Ty.isNull())
+      return {Int.extend(Ctx.getTypeSize(Ctx.BoolTy)),
+              getAPSIntType(Ctx, NewInt)};
+    if (!llvm::isPowerOf2_32(APSIntBitwidth) && !Ty.isNull())
+      return {Int.extend(Ctx.getTypeSize(Ty)), Ty};
+    return {Int, Ty};
   }
 
   // Perform implicit type conversion on binary symbolic expressions.

clang/test/Analysis/bitint-z3.c

@@ -1,23 +1,22 @@
-// RUN: %clang_cc1 -analyze -analyzer-checker=core -w -DNO_CROSSCHECK -verify %s
-// RUN: %clang_cc1 -analyze -analyzer-checker=core -w -analyzer-config crosscheck-with-z3=true -verify %s
+// RUN: %clang_analyze_cc1 -analyzer-checker=core,debug.ExprInspection -w \
+// RUN:   -analyzer-config crosscheck-with-z3=true -verify %s
 // REQUIRES: z3
 
-// The SMTConv layer did not comprehend _BitInt types (because this was an
-// evolved feature) and was crashing due to needed updates in 2 places.
-// Analysis is expected to find these cases using _BitInt without crashing.
+// Previously these tests were crashing because the SMTConv layer did not
+// comprehend the _BitInt types.
 
-_BitInt(35) a;
-int b;
-void c() {
+void clang_analyzer_warnIfReached();
+
+void c(int b, _BitInt(35) a) {
   int d;
   if (a)
     b = d; // expected-warning{{Assigned value is uninitialized [core.uninitialized.Assign]}}
+  clang_analyzer_warnIfReached(); // expected-warning{{REACHABLE}}
 }
 
-int *d;
-_BitInt(3) e;
-void f() {
+void f(int *d, _BitInt(3) e) {
   int g;
   d = &g;
-  e ?: 0; // expected-warning{{Address of stack memory associated with local variable 'g' is still referred to by the global variable 'd' upon returning to the caller.  This will be a dangling reference [core.StackAddressEscape]}}
+  e ?: 0;
+  clang_analyzer_warnIfReached(); // expected-warning{{REACHABLE}}
 }