Skip to content

Commit 9e6f2cb

Browse files
committed
Try to truncate the gcc 8.1 patch to exclude tests
1 parent f8e0d8b commit 9e6f2cb

File tree

1 file changed

+1
-33
lines changed

1 file changed

+1
-33
lines changed

prerequisites/build-functions/patches/gcc/8.1.0/partially-revert-rev259385.diff

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -26,36 +26,4 @@ index 00edd447bb2..87b3ca72c05 100644
2626
+ may_require_tmp = gfc_check_dependency (lhs_expr, rhs_expr, true) == 0
2727
? boolean_false_node : boolean_true_node;
2828
gfc_init_block (&block);
29-
30-
diff --git a/gcc/testsuite/gfortran.dg/coarray_dependency_1.f90 b/gcc/testsuite/gfortran.dg/coarray_dependency_1.f90
31-
new file mode 100644
32-
index 00000000000..dc4cbacba1e
33-
--- /dev/null
34-
+++ b/gcc/testsuite/gfortran.dg/coarray_dependency_1.f90
35-
@@ -0,0 +1,11 @@
36-
+! { dg-do compile }
37-
+! { dg-options "-fcoarray=lib -lcaf_single" }
38-
+!
39-
+! Check that reffing x on both sides of a coarray send does not ICE.
40-
+! PR 85507
41-
+
42-
+program check_dependency
43-
+ integer :: x[*]
44-
+ x[42] = x
45-
+end program check_dependency
46-
+
47-
diff --git a/gcc/testsuite/gfortran.dg/coarray_lib_comm_1.f90 b/gcc/testsuite/gfortran.dg/coarray_lib_comm_1.f90
48-
index a7567af7b8f..171a27bd4c3 100644
49-
--- a/gcc/testsuite/gfortran.dg/coarray_lib_comm_1.f90
50-
+++ b/gcc/testsuite/gfortran.dg/coarray_lib_comm_1.f90
51-
@@ -38,9 +38,8 @@ B(1:5) = B(3:7)
52-
if (any (A-B /= 0)) STOP 4
53-
end
54-
55-
-! { dg-final { scan-tree-dump-times "_gfortran_caf_get \\\(caf_token.0, \\\(integer\\\(kind=\[48\]\\\)\\\) parm.\[0-9\]+.data - \\\(integer\\\(kind=\[48\]\\\)\\\) a, 1, &parm.\[0-9\]+, 0B, &parm.\[0-9\]+, 4, 4, 0, 0B\\\);" 1 "original" } }
56-
-! { dg-final { scan-tree-dump-times "_gfortran_caf_get \\\(caf_token.0, \\\(integer\\\(kind=\[48\]\\\)\\\) parm.\[0-9\]+.data - \\\(integer\\\(kind=\[48\]\\\)\\\) a, 1, &parm.\[0-9\]+, 0B, &parm.\[0-9\]+, 4, 4, 1, 0B\\\);" 1 "original" } }
57-
+! { dg-final { scan-tree-dump-times "_gfortran_caf_get \\\(caf_token.0, \\\(integer\\\(kind=\[48\]\\\)\\\) parm.\[0-9\]+.data - \\\(integer\\\(kind=\[48\]\\\)\\\) a, 1, &parm.\[0-9\]+, 0B, &parm.\[0-9\]+, 4, 4, 1, 0B\\\);" 2 "original" } }
58-
! { dg-final { scan-tree-dump-times "_gfortran_caf_get \\\(caf_token.0, \\\(integer\\\(kind=\[48\]\\\)\\\) parm.\[0-9\]+.data - \\\(integer\\\(kind=\[48\]\\\)\\\) a, 1, &parm.\[0-9\]+, 0B, &p, 4, 4, 1, 0B\\\);" 1 "original" } }
59-
! { dg-final { scan-tree-dump-times "_gfortran_caf_get \\\(caf_token.1, \\\(integer\\\(kind=\[48\]\\\)\\\) parm.\[0-9\]+.data - \\\(integer\\\(kind=\[48\]\\\)\\\) b, 1, &parm.\[0-9\]+, 0B, &p, 4, 4, 0, 0B\\\);" 1 "original" } }
60-
-! { dg-final { scan-tree-dump-times "_gfortran_caf_sendget \\\(caf_token.0, \\\(integer\\\(kind=\[48\]\\\)\\\) parm.\[0-9\]+.data - \\\(integer\\\(kind=\[48\]\\\)\\\) a, 1, &parm.\[0-9\]+, 0B, caf_token.0, \\\(integer\\\(kind=\[48\]\\\)\\\) parm.\[0-9\]+.data - \\\(integer\\\(kind=\[48\]\\\)\\\) a, 1, &parm.\[0-9\]+, 0B, 4, 4, 0, 0B\\\);" 1 "original" } }
61-
+! { dg-final { scan-tree-dump-times "_gfortran_caf_sendget \\\(caf_token.0, \\\(integer\\\(kind=\[48\]\\\)\\\) parm.\[0-9\]+.data - \\\(integer\\\(kind=\[48\]\\\)\\\) a, 1, &parm.\[0-9\]+, 0B, caf_token.0, \\\(integer\\\(kind=\[48\]\\\)\\\) parm.\[0-9\]+.data - \\\(integer\\\(kind=\[48\]\\\)\\\) a, 1, &parm.\[0-9\]+, 0B, 4, 4, 1, 0B\\\);" 1 "original" } }
29+

0 commit comments

Comments
 (0)