This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[Committed] PR fortran/71935
- From: Steve Kargl <sgk at troutmask dot apl dot washington dot edu>
- To: fortran at gcc dot gnu dot org, gcc-patches at gcc dot gnu dot org
- Date: Fri, 22 Jul 2016 11:55:42 -0700
- Subject: [Committed] PR fortran/71935
- Authentication-results: sourceware.org; auth=none
- Reply-to: kargl at uw dot edu
I've committed the following patch under "obviously correct."
2016-07-22 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/71935
* check.c (is_c_interoperable): Simplify right expression.
2016-07-22 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/71935
* gfortran.dg/c_sizeof_1.f90: Move invalid code to ...
* gfortran.dg/c_sizeof_6.f90: here. Test for error.
* gfortran.dg/pr71935.f90: New test.
Index: gcc/fortran/check.c
===================================================================
--- gcc/fortran/check.c (revision 238660)
+++ gcc/fortran/check.c (working copy)
@@ -4278,7 +4278,7 @@ is_c_interoperable (gfc_expr *expr, cons
}
if (expr->ts.u.cl && expr->ts.u.cl->length
- && !gfc_simplify_expr (expr, 0))
+ && !gfc_simplify_expr (expr->ts.u.cl->length, 0))
gfc_internal_error ("is_c_interoperable(): gfc_simplify_expr failed");
if (!c_loc && expr->ts.u.cl
Index: gcc/testsuite/gfortran.dg/c_sizeof_1.f90
===================================================================
--- gcc/testsuite/gfortran.dg/c_sizeof_1.f90 (revision 238660)
+++ gcc/testsuite/gfortran.dg/c_sizeof_1.f90 (working copy)
@@ -22,9 +22,6 @@ if (i /= 4) call abort()
i = c_sizeof(str2(1))
if (i /= 1) call abort()
-i = c_sizeof(str2(1:3))
-if (i /= 3) call abort()
-
write(*,*) c_sizeof(cptr), c_sizeof(iptr), c_sizeof(C_NULL_PTR)
! Using GNU's SIZEOF
Index: gcc/testsuite/gfortran.dg/c_sizeof_6.f90
===================================================================
--- gcc/testsuite/gfortran.dg/c_sizeof_6.f90 (nonexistent)
+++ gcc/testsuite/gfortran.dg/c_sizeof_6.f90 (working copy)
@@ -0,0 +1,16 @@
+! { dg-do compile }
+!
+program foo
+
+ use iso_c_binding, only: c_int, c_char, c_sizeof
+
+ integer(kind=c_int) :: i
+
+ character(kind=c_char,len=1),parameter :: str2(4) = ["a","b","c","d"]
+
+ i = c_sizeof(str2(1:3)) ! { dg-error "must be an interoperable data" }
+
+ if (i /= 3) call abort()
+
+end program foo
+
Index: gcc/testsuite/gfortran.dg/pr71935.f90
===================================================================
--- gcc/testsuite/gfortran.dg/pr71935.f90 (nonexistent)
+++ gcc/testsuite/gfortran.dg/pr71935.f90 (working copy)
@@ -0,0 +1,7 @@
+! { dg-do compile }
+program p
+ use iso_c_binding
+ character(len=1, kind=c_char), parameter :: z(2) = 'z'
+ print *, sizeof(z(3)) ! { dg-error "is out of bounds" }
+ print *, c_sizeof(z(3)) ! { dg-error "is out of bounds" }
+end
--
Steve