Hello Everyone,
This patch fixes an ICE when rank mismatch occurs in a modify
expression where the right-hand side is a function call. The crash is actually
occuring in a while loop whose result is not used, i.e. dead code. I removed
the dead code and things seem to work fine now. Tested on x86 and x86_64. I
have also added test case.
I am committing this patch as obvious. If anyone has objections I am
willing to correct it (or even revert the patch).
Here are the ChangeLog entries:
gcc/c/ChangeLog
+2013-06-12 Balaji V. Iyer <[email protected]>
+
+ * c-array-notation.c (build_array_notation_expr): Reject array notation
+ mismatch between LHS and RHS even inside a call_expr. Also, removed
+ a couple while statements that were dead code.
+
gcc/testsuite/ChangeLog
+2013-06-12 Balaji V. Iyer <[email protected]>
+
+ PR c/57577
+ * c-c++-common/cilk-plus/AN/pr57577.c: New testcase.
+
Thanks,
Balaji V. Iyer.
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 72d182b..6179c3b 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-12 Balaji V. Iyer <[email protected]>
+
+ * c-array-notation.c (build_array_notation_expr): Reject array notation
+ mismatch between LHS and RHS even inside a call_expr. Also, removed
+ a couple while statements that were dead code.
+
2013-06-10 Balaji V. Iyer <[email protected]>
* c-array-notation.c (fix_builtin_array_notation_fn): Fully folded
diff --git a/gcc/c/c-array-notation.c b/gcc/c/c-array-notation.c
index 3285969..03b66b9 100644
--- a/gcc/c/c-array-notation.c
+++ b/gcc/c/c-array-notation.c
@@ -781,7 +781,7 @@ build_array_notation_expr (location_t location, tree lhs,
tree lhs_origtype,
rhs_list_size = vec_safe_length (rhs_list);
lhs_list_size = vec_safe_length (lhs_list);
- if (lhs_rank == 0 && rhs_rank != 0 && TREE_CODE (rhs) != CALL_EXPR)
+ if (lhs_rank == 0 && rhs_rank != 0)
{
tree rhs_base = rhs;
if (TREE_CODE (rhs_base) == ARRAY_NOTATION_REF)
@@ -802,17 +802,6 @@ build_array_notation_expr (location_t location, tree lhs,
tree lhs_origtype,
}
if (lhs_rank != 0 && rhs_rank != 0 && lhs_rank != rhs_rank)
{
- tree lhs_base = lhs;
- tree rhs_base = rhs;
-
- for (ii = 0; ii < lhs_rank; ii++)
- lhs_base = ARRAY_NOTATION_ARRAY (lhs_base);
-
- while (rhs_base && TREE_CODE (rhs_base) != ARRAY_NOTATION_REF)
- rhs_base = TREE_OPERAND (rhs_base, 0);
- for (ii = 0; ii < rhs_rank; ii++)
- rhs_base = ARRAY_NOTATION_ARRAY (rhs_base);
-
error_at (location, "rank mismatch between %qE and %qE", lhs, rhs);
pop_stmt_list (an_init);
return error_mark_node;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b167e4c..5c45e1a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-12 Balaji V. Iyer <[email protected]>
+
+ PR c/57577
+ * c-c++-common/cilk-plus/AN/pr57577.c: New testcase.
+
2013-06-12 Paolo Carlini <[email protected]>
PR c++/38958
diff --git a/gcc/testsuite/c-c++-common/cilk-plus/AN/pr57577.c
b/gcc/testsuite/c-c++-common/cilk-plus/AN/pr57577.c
new file mode 100755
index 0000000..fb3490e
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/cilk-plus/AN/pr57577.c
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-options "-fcilkplus" } */
+
+int A[10], B[10][10];
+int foo (int a);
+
+int main () {
+ A[:] = foo (B[:][:]); /* { dg-error "rank mismatch between" } */
+ A[0] = foo (B[:][:]); /* { dg-error "cannot be scalar when" } */
+ return 0;
+}
