Merge pull request #534 from sourceryinstitute/patch-gfortran-8.1.0

install.sh patches gfortran 8.1.0 before building

Author: Damian Rouson

prerequisites/build-functions/build_and_install.sh

@@ -1,3 +1,4 @@
+# shellcheck shell=bash
 # Make the build directory, configure, and build
 # shellcheck disable=SC2154
 
@@ -6,7 +7,6 @@ source "${OPENCOARRAYS_SRC_DIR}/prerequisites/build-functions/edit_GCC_download_
 
 build_and_install()
 {
-
   num_threads=${arg_j}
   build_path="${OPENCOARRAYS_SRC_DIR}/prerequisites/builds/${package_to_build}-${version_to_build}"
 
@@ -45,13 +45,22 @@ build_and_install()
 
   else # ${package_to_build} == "gcc"
 
-    # Use GCC's contrib/download_prerequisites script after modifying it, if necessary, to use the
-    # the preferred download mechanism set in prerequisites/build-functions/set_or_print_downloader.sh
-
     info "pushd ${download_path}/${package_source_directory} "
     pushd "${download_path}/${package_source_directory}"
 
-    # Switch download mechanism, if wget is not available
+    # Patch gfortran if necessary
+    export patches_dir="${OPENCOARRAYS_SRC_DIR}/prerequisites/build-functions/patches/${package_to_build}/${version_to_build}"
+    if [[ -d "${patches_dir:-}" ]]; then
+      for patch in "${patches_dir%/}"*.diff ; do
+	info "Applying patch ${patch##*/} to $package_to_build ${version_to_build}."
+	patch -p1 < "$patch"
+      done
+    fi
+
+    # Use GCC's contrib/download_prerequisites script after modifying it, if necessary, to use the
+    # the preferred download mechanism set in prerequisites/build-functions/set_or_print_downloader.sh
+
+    # Switch download mechanism if wget is not available
     edit_GCC_download_prereqs_file_if_necessary
 
     # Download GCC prerequisities

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

@@ -0,0 +1,61 @@
+diff --git a/gcc/fortran/dependency.c b/gcc/fortran/dependency.c
+index 3e14ddc25d8..a0bbd584947 100644
+--- a/gcc/fortran/dependency.c
++++ b/gcc/fortran/dependency.c
+@@ -2238,9 +2238,8 @@ gfc_dep_resolver (gfc_ref *lref, gfc_ref *rref, gfc_reverse *reverse)
+ 	    break;
+ 
+ 	  /* Exactly matching and forward overlapping ranges don't cause a
+-	     dependency, when they are not part of a coarray ref.  */
+-	  if (fin_dep < GFC_DEP_BACKWARD
+-	      && lref->u.ar.codimen == 0 && rref->u.ar.codimen == 0)
++	     dependency.  */
++	  if (fin_dep < GFC_DEP_BACKWARD)
+ 	    return 0;
+ 
+ 	  /* Keep checking.  We only have a dependency if
+diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c
+index 00edd447bb2..87b3ca72c05 100644
+--- a/gcc/fortran/trans-intrinsic.c
++++ b/gcc/fortran/trans-intrinsic.c
+@@ -1860,7 +1860,7 @@ conv_caf_send (gfc_code *code) {
+ 
+   lhs_expr = code->ext.actual->expr;
+   rhs_expr = code->ext.actual->next->expr;
+-  may_require_tmp = gfc_check_dependency (lhs_expr, rhs_expr, false) == 0
++  may_require_tmp = gfc_check_dependency (lhs_expr, rhs_expr, true) == 0
+ 		    ? boolean_false_node : boolean_true_node;
+   gfc_init_block (&block);
+ 
+diff --git a/gcc/testsuite/gfortran.dg/coarray_dependency_1.f90 b/gcc/testsuite/gfortran.dg/coarray_dependency_1.f90
+new file mode 100644
+index 00000000000..dc4cbacba1e
+--- /dev/null
++++ b/gcc/testsuite/gfortran.dg/coarray_dependency_1.f90
+@@ -0,0 +1,11 @@
++! { dg-do compile }
++! { dg-options "-fcoarray=lib -lcaf_single" }
++!
++! Check that reffing x on both sides of a coarray send does not ICE. 
++! PR 85507
++
++program check_dependency
++  integer :: x[*]
++  x[42] = x
++end program check_dependency
++
+diff --git a/gcc/testsuite/gfortran.dg/coarray_lib_comm_1.f90 b/gcc/testsuite/gfortran.dg/coarray_lib_comm_1.f90
+index a7567af7b8f..171a27bd4c3 100644
+--- a/gcc/testsuite/gfortran.dg/coarray_lib_comm_1.f90
++++ b/gcc/testsuite/gfortran.dg/coarray_lib_comm_1.f90
+@@ -38,9 +38,8 @@ B(1:5) = B(3:7)
+ if (any (A-B /= 0)) STOP 4
+ end
+ 
+-! { 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" } }
+-! { 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" } }
++! { 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" } }
+ ! { 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" } }
+ ! { 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" } }
+-! { 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" } }
++! { 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" } }

prerequisites/build.sh

@@ -30,7 +30,6 @@
 # (3) Parse the usage information (default usage file name: current file's name with -usage appended).
 # (4) Parse the command line using the usage information.
 
-
 export OPENCOARRAYS_SRC_DIR="${OPENCOARRAYS_SRC_DIR:-${PWD%prerequisites*}}"
 export __usage=${OPENCOARRAYS_SRC_DIR}/prerequisites/build.sh-usage
 if [[ ! -f "${OPENCOARRAYS_SRC_DIR}/src/libcaf.h" ]]; then