[gcc r11-10101] Fortran: fix checking of arguments to UNPACK when MASK is a variable [PR105813]

[Harald Anlauf]

https://gcc.gnu.org/g:9902f93edd43853cd958b2e124878865da69a177

commit r11-10101-g9902f93edd43853cd958b2e124878865da69a177
Author: Harald Anlauf <anlauf@gmx.de>
Date:   Fri Jun 24 22:21:39 2022 +0200

    Fortran: fix checking of arguments to UNPACK when MASK is a variable [PR105813]
    
    gcc/fortran/ChangeLog:
    
            PR fortran/105813
            * check.c (gfc_check_unpack): Try to simplify MASK argument to
            UNPACK so that checking of the VECTOR argument can work when MASK
            is a variable.
    
    gcc/testsuite/ChangeLog:
    
            PR fortran/105813
            * gfortran.dg/unpack_vector_1.f90: New test.
    
    (cherry picked from commit f21f17f95c0237f4f987a5fa9f1fa9c7e0db3c40)

Diff:
---
 gcc/fortran/check.c                           |  2 ++
 gcc/testsuite/gfortran.dg/unpack_vector_1.f90 | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c
index 1add9436dce..4e2736fef1e 100644
--- a/gcc/fortran/check.c
+++ b/gcc/fortran/check.c
@@ -6342,6 +6342,8 @@ gfc_check_unpack (gfc_expr *vector, gfc_expr *mask, gfc_expr *field)
   if (!same_type_check (vector, 0, field, 2))
     return false;
 
+  gfc_simplify_expr (mask, 0);
+
   if (mask->expr_type == EXPR_ARRAY
       && gfc_array_size (vector, &vector_size))
     {
diff --git a/gcc/testsuite/gfortran.dg/unpack_vector_1.f90 b/gcc/testsuite/gfortran.dg/unpack_vector_1.f90
new file mode 100644
index 00000000000..5347c111e8f
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/unpack_vector_1.f90
@@ -0,0 +1,12 @@
+! { dg-do compile }
+! PR fortran/105813
+! Fix checking of VECTOR argument to UNPACK when MASK is a variable.
+! Contributed by G.Steinmetz
+
+program p
+  logical, parameter :: mask(2,2) = reshape ([.true.,  .true.,  &
+                                              .false., .true.], &
+                                              shape (mask))
+  print *, unpack ([1,2,3], mask, 0) ! OK
+  print *, unpack ([1,2],   mask, 0) ! { dg-error "must provide at least" }
+end