From ba08c251333c0002d8cd68d515533ef0614522fd Mon Sep 17 00:00:00 2001
From: Lukasz Dalek <ldalek@antmicro.com>
Date: Fri, 17 Jul 2020 14:37:44 +0200
Subject: Fix subarray access condition

Signed-off-by: Lukasz Dalek <ldalek@antmicro.com>
---
 frontends/ast/simplify.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 66f22e113..a166f8a89 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -1478,7 +1478,7 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage,
 
 		for (int i = 0; 2*i < GetSize(id2ast->multirange_dimensions); i++)
 		{
-			if (GetSize(children[0]->children) < i)
+			if (GetSize(children[0]->children) <= i)
 				log_file_error(filename, location.first_line, "Insufficient number of array indices for %s.\n", log_id(str));
 
 			AstNode *new_index_expr = children[0]->children[i]->children.at(0)->clone();
-- 
cgit v1.2.3


From daee2d967f5785c83123a1afa5b8bdcddf3da1d8 Mon Sep 17 00:00:00 2001
From: Lukasz Dalek <ldalek@antmicro.com>
Date: Mon, 3 Aug 2020 17:07:33 +0200
Subject: Add test for subarray access on multidimensional arrays

Signed-off-by: Lukasz Dalek <ldalek@antmicro.com>
---
 tests/svtypes/multirange_subarray_access.ys | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 tests/svtypes/multirange_subarray_access.ys

diff --git a/tests/svtypes/multirange_subarray_access.ys b/tests/svtypes/multirange_subarray_access.ys
new file mode 100644
index 000000000..de57d1423
--- /dev/null
+++ b/tests/svtypes/multirange_subarray_access.ys
@@ -0,0 +1,12 @@
+logger -expect error "Insufficient number of array indices for a." 1
+read_verilog -sv <<EOT
+module foo;
+logic a [6:0][4:0][1:0];
+logic b [1:0];
+
+assign a[0][0][0] = 1'b0;
+assign a[0][0][1] = 1'b1;
+assign b = a[0][0];
+
+endmodule
+EOT
-- 
cgit v1.2.3