From patchwork Wed Oct 5 08:51:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikael Morin X-Patchwork-Id: 58768 From: morin-mikael@orange.fr (Mikael Morin) Date: Wed, 5 Oct 2022 10:51:06 +0200 Subject: [PATCH] Fortran: error recovery for invalid types in array constructors [PR107000] In-Reply-To: References: Message-ID: <1bf3b7b5-39ac-0c94-256c-f739a4746a7b@orange.fr> Hello Le 04/10/2022 ? 23:19, Harald Anlauf via Fortran a ?crit?: > Dear all, > > we did not recover well from bad expressions in array constructors, > especially when there was a typespec and a unary '+' or '-', and > when the array constructor was used in an arithmetic expression. > > The attached patch introduces an ARITH_INVALID_TYPE that is used > when we try to recover from these errors, and tries to handle > all unary and binary arithmetic expressions. > In the PR, you noted an inconsistency in the error message reported, depending on the presence or lack of an operator. I'm not sure you saw the suggestion to do the following in the last message I posted: In the testcase, it improves the situation slightly. For example, from: > 9 | x = (1.0, 2.0) * [complex :: +'1'] ! { dg-error "Invalid type" } > | 1 > Error: Invalid type in arithmetic operation at (1) to: > 9 | x = (1.0, 2.0) * [complex :: +'1'] ! { dg-error "Invalid type" } > | 1 > Error: Operand of unary numeric operator ?+? at (1) is UNKNOWN or from: > 29 | print *, 2 * [real :: 0, 1+'1'] ! { dg-error "Invalid type" } > | 1 > Error: Invalid type in arithmetic operation at (1) to: > 29 | print *, 2 * [real :: 0, 1+'1'] ! { dg-error "Invalid type" } > | 1 > Error: Operands of binary numeric operator ?+? at (1) are INTEGER(4)/CHARACTER(1) Unfortunately, it doesn't fix the bogus incommensurate arrays errors. diff --git a/gcc/fortran/arith.cc b/gcc/fortran/arith.cc index e6e35ef3c42..ed93ddb2882 100644 --- a/gcc/fortran/arith.cc +++ b/gcc/fortran/arith.cc @@ -1654,6 +1654,8 @@ eval_intrinsic (gfc_intrinsic_op op, else rc = reduce_binary (eval.f3, op1, op2, &result); + if (rc == ARITH_INVALID_TYPE) + goto runtime; /* Something went wrong. */ if (op == INTRINSIC_POWER && rc == ARITH_PROHIBIT)