From 567e3e7afa08918e6d0acbe65889284d8db7ab49 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Mon, 18 Jun 2018 16:54:37 +0300
Subject: [PATCH] validation: fix up some failures

The impossible test has been problematice for a while so I'm just deleting
it.  Also there are some sval_to_str() differences.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 smatch_sval.c               |  6 ++--
 validation/sm_impossible3.c | 71 ---------------------------------------------
 validation/sm_math2.c       |  2 +-
 3 files changed, 4 insertions(+), 75 deletions(-)
 delete mode 100644 validation/sm_impossible3.c

diff --git a/smatch_sval.c b/smatch_sval.c
index 5a7d3087..667c8fa3 100644
--- a/smatch_sval.c
+++ b/smatch_sval.c
@@ -546,14 +546,14 @@ const char *sval_to_str(sval_t sval)
 		return "u64max";
 	if (sval_unsigned(sval) && sval.value == UINT_MAX)
 		return "u32max";
-	if (sval_unsigned(sval) && sval.value == USHRT_MAX)
+	if (sval.value == USHRT_MAX)
 		return "u16max";
 
 	if (sval_signed(sval) && sval.value == LLONG_MAX)
 		return "s64max";
-	if (sval_signed(sval) && sval.value == INT_MAX)
+	if (sval.value == INT_MAX)
 		return "s32max";
-	if (sval_signed(sval) && sval.value == SHRT_MAX)
+	if (sval.value == SHRT_MAX)
 		return "s16max";
 
 	if (sval_signed(sval) && sval.value == SHRT_MIN)
diff --git a/validation/sm_impossible3.c b/validation/sm_impossible3.c
deleted file mode 100644
index 8b642bdb..00000000
--- a/validation/sm_impossible3.c
+++ /dev/null
@@ -1,71 +0,0 @@
-#include "check_debug.h"
-
-int a;
-
-static void ad_agg_selection_logic(void)
-{
-
-	if (a < 0 || a > 2)
-		return;
-
-	switch (a) {
-	case 1:
-		break;
-	default:
-		__smatch_implied(a);
-		__smatch_states("register_impossible");
-
-	}
-
-	switch (a) {
-	case 0:
-	case 1:
-	case 2:
-		break;
-	default:
-		__smatch_implied(a);
-		__smatch_states("register_impossible");
-	}
-
-	switch (a) {
-	case 0:
-	case 1:
-	case 2:
-	default:
-		__smatch_states("register_impossible");
-	}
-
-	switch (a) {
-	case 4:
-		__smatch_states("register_impossible");
-	case 3:
-	case 0:
-		__smatch_states("register_impossible");
-		break;
-	case 1:
-	case 2:
-		__smatch_states("register_impossible");
-		break;
-	default:
-		__smatch_states("register_impossible");
-	}
-
-
-}
-
-/*
- * check-name: smatch impossible #3
- * check-command: smatch -I.. sm_impossible3.c
- *
- * check-output-start
-sm_impossible3.c:15 ad_agg_selection_logic() implied: a = '0,2'
-sm_impossible3.c:16 ad_agg_selection_logic() register_impossible: no states
-sm_impossible3.c:26 ad_agg_selection_logic() implied: a = ''
-sm_impossible3.c:27 ad_agg_selection_logic() [register_impossible] 'impossible' = 'impossible'
-sm_impossible3.c:35 ad_agg_selection_logic() [register_impossible] 'impossible' = 'merged' (impossible, undefined, merged)
-sm_impossible3.c:40 ad_agg_selection_logic() [register_impossible] 'impossible' = 'impossible'
-sm_impossible3.c:43 ad_agg_selection_logic() [register_impossible] 'impossible' = 'merged' (impossible, undefined, merged)
-sm_impossible3.c:47 ad_agg_selection_logic() [register_impossible] 'impossible' = 'merged' (impossible, undefined, merged)
-sm_impossible3.c:50 ad_agg_selection_logic() [register_impossible] 'impossible' = 'impossible'
- * check-output-end
- */
diff --git a/validation/sm_math2.c b/validation/sm_math2.c
index 61e60b72..d9bd1643 100644
--- a/validation/sm_math2.c
+++ b/validation/sm_math2.c
@@ -20,6 +20,6 @@ void test(void)
  * check-output-start
 sm_math2.c:11 test() implied: a = '0-255'
 sm_math2.c:12 test() implied: b = '0,256-65280'
-sm_math2.c:13 test() implied: c = '0-65535'
+sm_math2.c:13 test() implied: c = '0-u16max'
  * check-output-end
  */
-- 
2.11.4.GIT