From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Mon, 26 Nov 2012 08:25:37 +0000 (+0300)
Subject: extra: tweak handling of absolute min/max in comparisons
X-Git-Tag: 1.57~155
X-Git-Url: https://repo.or.cz/w/smatch.git/commitdiff_plain/4038e45c3ac2a531fc3ae20c46d97778527db4c9

extra: tweak handling of absolute min/max in comparisons

The checks for "if (!sval_is_min(rl_min(right_orig)))" don't make any
sense.  I don't know why they were there in the first place.

There are some other similar checks which do make sense because we add one
or subtract one and we can't add one to max.  I have left those.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---

diff --git a/smatch_extra.c b/smatch_extra.c
index 5a6eb85a..d29f7ced 100644
--- a/smatch_extra.c
+++ b/smatch_extra.c
@@ -752,15 +752,12 @@ static void match_comparison(struct expression *expr)
 	switch (expr->op) {
 	case '<':
 	case SPECIAL_UNSIGNED_LT:
-		if (!sval_is_max(rl_max(right_orig))) {
-			left_true = remove_range(left_orig, rl_max(right_orig), max);
-		}
+		left_true = remove_range(left_orig, rl_max(right_orig), max);
 		if (!sval_is_min(rl_min(right_orig))) {
 			left_false = remove_range(left_orig, min, sub_one(rl_min(right_orig)));
 		}
 
-		if (!sval_is_min(rl_min(left_orig)))
-			right_true = remove_range(right_orig, min, rl_min(left_orig));
+		right_true = remove_range(right_orig, min, rl_min(left_orig));
 		if (!sval_is_max(rl_max(left_orig)))
 			right_false = remove_range(right_orig, add_one(rl_max(left_orig)), max);
 		break;
@@ -768,13 +765,11 @@ static void match_comparison(struct expression *expr)
 	case SPECIAL_LTE:
 		if (!sval_is_max(rl_max(right_orig)))
 			left_true = remove_range(left_orig, add_one(rl_max(right_orig)), max);
-		if (!sval_is_min(rl_min(right_orig)))
-			left_false = remove_range(left_orig, min, rl_min(right_orig));
+		left_false = remove_range(left_orig, min, rl_min(right_orig));
 
 		if (!sval_is_min(rl_min(left_orig)))
 			right_true = remove_range(right_orig, min, sub_one(rl_min(left_orig)));
-		if (!sval_is_max(rl_max(left_orig)))
-			right_false = remove_range(right_orig, rl_max(left_orig), max);
+		right_false = remove_range(right_orig, rl_max(left_orig), max);
 
 		if (sval_cmp(rl_min(left_orig), rl_min(right_orig)) == 0)
 			left_false = remove_range(left_false, rl_min(left_orig), rl_min(left_orig));
@@ -802,13 +797,11 @@ static void match_comparison(struct expression *expr)
 	case SPECIAL_GTE:
 		if (!sval_is_min(rl_min(right_orig)))
 			left_true = remove_range(left_orig, min, sub_one(rl_min(right_orig)));
-		if (!sval_is_max(rl_max(right_orig)))
-			left_false = remove_range(left_orig, rl_max(right_orig), max);
+		left_false = remove_range(left_orig, rl_max(right_orig), max);
 
 		if (!sval_is_max(rl_max(left_orig)))
 			right_true = remove_range(right_orig, add_one(rl_max(left_orig)), max);
-		if (!sval_is_min(rl_min(left_orig)))
-			right_false = remove_range(right_orig, min, rl_min(left_orig));
+		right_false = remove_range(right_orig, min, rl_min(left_orig));
 
 		if (sval_cmp(rl_min(left_orig), rl_min(right_orig)) == 0)
 			right_false = remove_range(right_false, rl_min(left_orig), rl_min(left_orig));
@@ -817,13 +810,11 @@ static void match_comparison(struct expression *expr)
 		break;
 	case '>':
 	case SPECIAL_UNSIGNED_GT:
-		if (!sval_is_min(rl_min(right_orig)))
-			left_true = remove_range(left_orig, min, rl_min(right_orig));
+		left_true = remove_range(left_orig, min, rl_min(right_orig));
 		if (!sval_is_max(rl_max(right_orig)))
 			left_false = remove_range(left_orig, add_one(rl_max(right_orig)), max);
 
-		if (!sval_is_max(rl_max(left_orig)))
-			right_true = remove_range(right_orig, rl_max(left_orig), max);
+		right_true = remove_range(right_orig, rl_max(left_orig), max);
 		if (!sval_is_min(rl_min(left_orig)))
 			right_false = remove_range(right_orig, min, sub_one(rl_min(left_orig)));
 		break;