Hello,
Le 01/05/2023 à 18:29, Harald Anlauf via Fortran a écrit :
Dear all,
the attached patch is mostly self-explaining: we mishandled the
overloading of intrinsic binary operators in the case the actual
operands were of intrinsic numeric type and the ranks of the
operands were not conformable, i.e. both were of non-zero and
different ranks. In that case the operators could be converted
to the same type before the correct user-defined operator was
resolved, leading to either rejects-valid or accepts-invalid
or wrong resolution (= wrong code).
Regtested on x86_64-pc-linux-gnu. OK for mainline?
The patch is actually very limited in impact, but the bug is
sort of annoying. Would it be OK to backport to 13.2 after
some waiting?
Thanks,
Harald
(...)
diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc
index c3d508fb45d..341909d7de7 100644
--- a/gcc/fortran/resolve.cc
+++ b/gcc/fortran/resolve.cc
@@ -5644,6 +5666,23 @@ done:
}
+/* Given two expressions, check that their rank is conformable, i.e. either
+ both have the same rank or at least one is a scalar. */
+
+bool
+gfc_op_rank_conformable (gfc_expr *op1, gfc_expr *op2)
+{
+// if (op1->expr_type == EXPR_VARIABLE && op1->ref)
Please remove this, and the other one below.
+ if (op1->expr_type == EXPR_VARIABLE)
+ gfc_expression_rank (op1);
+// if (op2->expr_type == EXPR_VARIABLE && op2->ref)
+ if (op2->expr_type == EXPR_VARIABLE)
+ gfc_expression_rank (op2);
+
+ return (op1->rank == 0 || op2->rank == 0 || op1->rank == op2->rank);
+}
+
+
static void
add_caf_get_intrinsic (gfc_expr *e)
{
The rest looks good.
OK for master, and backport as well.
Thanks
Mikael
