Fix size calculation of unsized bool array

Commit Message

Luc Van Oostenryck Jan. 7, 2016, 1:47 a.m. UTC

This stops sparse from issuing the error message
	"error: cannot size expression"
for code like:
	static _Bool boolarray[] = {
		0,
		1,
	};
	static int n = sizeof(boolarray);

The fix consists of using array_element_offset() for calculating
the size of unsized arrays, like it is done elsewhere for sized ones.

Signed-off-by: Luc Van Oostenryck <[e-mail]>
---
 symbol.c                |  2 +-
 validation/bool-array.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 validation/bool-array.c

Comments

Christopher Li Feb. 4, 2016, 4:10 p.m. UTC | #1

On Thu, Jan 7, 2016 at 9:47 AM, Luc Van Oostenryck
<[e-mail]> wrote:
> This stops sparse from issuing the error message
>         "error: cannot size expression"
> for code like:
>         static _Bool boolarray[] = {
>                 0,
>                 1,
>         };
>         static int n = sizeof(boolarray);

This patch looks great. Applied.

Chris
--
To unsubscribe from this list: send the line "unsubscribe linux-sparse" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/symbol.c b/symbol.c
index 0ceff628..92a7a625 100644
--- a/symbol.c
+++ b/symbol.c
@@ -393,7 +393,7 @@  static struct symbol * examine_node_type(struct symbol *sym)
 			int count = count_array_initializer(node_type, initializer);
 
 			if (node_type && node_type->bit_size >= 0)
-				bit_size = node_type->bit_size * count;
+				bit_size = array_element_offset(node_type->bit_size, count);
 		}
 	}
 	
diff --git a/validation/bool-array.c b/validation/bool-array.c
new file mode 100644
index 00000000..6c4c8723
--- /dev/null
+++ b/validation/bool-array.c
@@ -0,0 +1,47 @@ 
+static _Bool boolarray_d1[1];
+static _Bool boolarray_d8[8];
+static _Bool boolarray_i2[2] = {
+	0,
+	1,
+};
+static int nd1 = sizeof(boolarray_d1);
+static int nd8 = sizeof(boolarray_d8);
+static int ni2 = sizeof(boolarray_i2);
+
+
+static long longarray_u2[] = {
+	0,
+	1,
+};
+static int nl2 = sizeof(longarray_u2);
+
+/*
+ * Used to get "warning: excessive elements in array initializer"
+ * for all elements but the first one.
+ * Note: only occurs if nbr of elements is a multiple of 8
+ *       (if not, theer was another problem)
+ */
+static _Bool boolarray_u8[] = {
+	0,
+	1,
+	0,
+	1,
+	0,
+	1,
+	0,
+	1,
+};
+
+/*
+ * Used to get "error: cannot size expression" for the sizeof.
+ */
+static _Bool boolarray_u2[] = {
+	0,
+	1,
+};
+static int nu2 = sizeof(boolarray_u2);
+
+/*
+ * check-name: sizeof(bool array)
+ * check-command: sparse -Wno-sizeof-bool $file
+ */