Revert "[analyzer] Model casts to bool differently from other numbers."

This seems to be causing quite a slowdown on our internal analyzer bot,
and I'm not sure why. Needs further investigation.

This reverts r180638 / 9e161ea981f22ae017b6af09d660bfc3ddf16a09.

llvm-svn: 180714

1 files changed, 5 insertions, 11 deletions

diff --git a/clang/test/Analysis/bool-assignment.c b/clang/test/Analysis/bool-assignment.c
index 0f782fbfd9a..86a581def64 100644
--- a/clang/test/Analysis/bool-assignment.c
+++ b/clang/test/Analysis/bool-assignment.c
@@ -1,19 +1,15 @@
 // RUN: %clang_cc1 -analyze -analyzer-checker=core,alpha.core.BoolAssignment -analyzer-store=region -verify -std=c99 -Dbool=_Bool %s
 // RUN: %clang_cc1 -analyze -analyzer-checker=core,alpha.core.BoolAssignment -analyzer-store=region -verify -x c++ %s
 
-// Test C++'s bool and C's _Bool.
-// FIXME: We stopped warning on these when SValBuilder got smarter about
-// casts to bool. Arguably, however, these conversions are okay; the result
-// is always 'true' or 'false'.
+// Test C++'s bool and C's _Bool
 
 void test_stdbool_initialization(int y) {
-  bool constant = 2; // no-warning
   if (y < 0) {
-    bool x = y; // no-warning
+    bool x = y; // expected-warning {{Assignment of a non-Boolean value}}
     return;
   }
   if (y > 1) {
-    bool x = y; // no-warning
+    bool x = y; // expected-warning {{Assignment of a non-Boolean value}}
     return;
   }
   bool x = y; // no-warning
@@ -22,11 +18,11 @@ void test_stdbool_initialization(int y) {
 void test_stdbool_assignment(int y) {
   bool x = 0; // no-warning
   if (y < 0) {
-    x = y; // no-warning
+    x = y; // expected-warning {{Assignment of a non-Boolean value}}
     return;
   }
   if (y > 1) {
-    x = y; // no-warning
+    x = y; // expected-warning {{Assignment of a non-Boolean value}}
     return;
   }
   x = y; // no-warning
@@ -37,7 +33,6 @@ void test_stdbool_assignment(int y) {
 typedef signed char BOOL;
 
 void test_BOOL_initialization(int y) {
-  BOOL constant = 2; // expected-warning {{Assignment of a non-Boolean value}}
   if (y < 0) {
     BOOL x = y; // expected-warning {{Assignment of a non-Boolean value}}
     return;
@@ -68,7 +63,6 @@ void test_BOOL_assignment(int y) {
 typedef unsigned char Boolean;
 
 void test_Boolean_initialization(int y) {
-  Boolean constant = 2; // expected-warning {{Assignment of a non-Boolean value}}
   if (y < 0) {
     Boolean x = y; // expected-warning {{Assignment of a non-Boolean value}}
     return;