From: Tobias Burnus <tobias@codesourcery.com>
Date: Tue, 26 Oct 2021 14:04:52 +0000 (+0200)
Subject: Fortran: Fix character(len=cst) dummies with bind(C) [PR102885]
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1c7a10911ba16d06894f4a563a1f81bf1c03e0e;p=thirdparty%2Fgcc.git

Fortran: Fix character(len=cst) dummies with bind(C) [PR102885]

	PR fortran/102885

gcc/fortran/ChangeLog:

	* trans-decl.c (gfc_conv_cfi_to_gfc): Properly handle nonconstant
	character lenghts.

gcc/testsuite/ChangeLog:

	* gfortran.dg/lto/bind-c-char_0.f90: New test.

(cherry picked from commit a31a3d0421f0cf1f7eefacfec8cbf37e7f91600d)
---

diff --git a/gcc/fortran/ChangeLog.omp b/gcc/fortran/ChangeLog.omp
index 4ca778c21359..c1f975072c08 100644
--- a/gcc/fortran/ChangeLog.omp
+++ b/gcc/fortran/ChangeLog.omp
@@ -1,3 +1,12 @@
+2021-10-26  Tobias Burnus  <tobias@codesourcery.com>
+
+	Backport from master:
+	2021-10-26  Tobias Burnus  <tobias@codesourcery.com>
+
+	PR fortran/102885
+	* trans-decl.c (gfc_conv_cfi_to_gfc): Properly handle nonconstant
+	character lenghts.
+
 2021-10-21  Tobias Burnus  <tobias@codesourcery.com>
 
 	Backport from master:
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
index 57d044d49231..5a9754007b5e 100644
--- a/gcc/fortran/trans-decl.c
+++ b/gcc/fortran/trans-decl.c
@@ -6835,6 +6835,13 @@ gfc_conv_cfi_to_gfc (stmtblock_t *init, stmtblock_t *finally,
       gfc_add_modify (&block, sym->ts.u.cl->backend_decl, tmp);
     }
 
+  if (sym->ts.type == BT_CHARACTER
+      && !INTEGER_CST_P (sym->ts.u.cl->backend_decl))
+    {
+      gfc_conv_string_length (sym->ts.u.cl, NULL, init);
+      gfc_trans_vla_type_sizes (sym, init);
+    }
+
   /* gfc->data = cfi->base_addr - or for scalars: gfc = cfi->base_addr.
      assumed-size/explicit-size arrays end up here for character(len=*)
      only. */
diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp
index 735c4105008b..159227b39f75 100644
--- a/gcc/testsuite/ChangeLog.omp
+++ b/gcc/testsuite/ChangeLog.omp
@@ -1,3 +1,11 @@
+2021-10-26  Tobias Burnus  <tobias@codesourcery.com>
+
+	Backport from master:
+	2021-10-26  Tobias Burnus  <tobias@codesourcery.com>
+
+	PR fortran/102885
+	* gfortran.dg/lto/bind-c-char_0.f90: New test.
+
 2021-10-21  Tobias Burnus  <tobias@codesourcery.com>
 
 	Backport from master:
diff --git a/gcc/testsuite/gfortran.dg/lto/bind-c-char_0.f90 b/gcc/testsuite/gfortran.dg/lto/bind-c-char_0.f90
new file mode 100644
index 000000000000..48b495b1d296
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/lto/bind-c-char_0.f90
@@ -0,0 +1,49 @@
+! { dg-lto-do link }
+! { dg-lto-options {{ -O0 -flto }} }
+!
+! PR fortran/102885
+
+module m
+  use iso_c_binding, only: c_char
+  implicit none (type, external)
+
+contains
+
+! Assumed-shape array, nonallocatable/nonpointer
+
+subroutine ar3 (xn, n) bind(C)
+  integer :: n
+  character(len=n) :: xn(..)
+  if (size(xn) /= 6) stop
+  if (len(xn) /= 5) stop  
+  select rank(xn)
+    rank(1)
+      xn = ['FDGhf', &
+            'hdrhg', &
+            'fDgFl', &
+            'DFHs3', &
+            '4a54G', &
+            'hSs6k']
+  rank default
+    stop
+  end select
+end
+
+end
+
+program main
+  use m
+  implicit none (type, external)
+  character(kind=c_char, len=5) :: str5a6(6)
+
+  ! assumed rank - with array descriptor
+
+  str5a6 = ['DDGhf', &
+            'hdrh$', &
+            'fDGSl', &
+            'DFHs3', &
+            '43grG', &
+            'hFG$k']
+  call ar3 (str5a6, 5)
+
+end