From 7edc89d4c168867a240e54533b2214bbc2a1987c Mon Sep 17 00:00:00 2001 From: Thomas Koenig Date: Wed, 23 Apr 2008 05:50:54 +0000 Subject: re PR fortran/35988 (run-time abort for MATMUL of run-time zero sized array) 2008-04-23 Thomas Koenig PR libfortran/35988 * m4/matmul.m4: Only issue a runtime error if extents are non-zero. * generated/matmul_i1.c: Regenerated. * generated/matmul_i2.c: Regenerated. * generated/matmul_i4.c: Regenerated. * generated/matmul_i8.c: Regenerated. * generated/matmul_i16.c: Regenerated. * generated/matmul_r4.c: Regenerated. * generated/matmul_r8.c: Regenerated. * generated/matmul_r10.c: Regenerated. * generated/matmul_r16.c: Regenerated. * generated/matmul_c4.c: Regenerated. * generated/matmul_c8.c: Regenerated. * generated/matmul_c10.c: Regenerated. * generated/matmul_c16.c: Regenerated. 2008-04-23 Thomas Koenig PR libfortran/35988 * gfortran.dg/matmul_7.f90: New test. From-SVN: r134579 --- libgfortran/generated/matmul_i2.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libgfortran/generated/matmul_i2.c') diff --git a/libgfortran/generated/matmul_i2.c b/libgfortran/generated/matmul_i2.c index 143f783..e3119ac 100644 --- a/libgfortran/generated/matmul_i2.c +++ b/libgfortran/generated/matmul_i2.c @@ -170,7 +170,10 @@ matmul_i2 (gfc_array_i2 * const restrict retarray, } if (count != b->dim[0].ubound + 1 - b->dim[0].lbound) - runtime_error ("dimension of array B incorrect in MATMUL intrinsic"); + { + if (count > 0 || b->dim[0].ubound + 1 - b->dim[0].lbound > 0) + runtime_error ("dimension of array B incorrect in MATMUL intrinsic"); + } if (GFC_DESCRIPTOR_RANK (b) == 1) { -- cgit v1.1