From patchwork Tue Oct 11 18:47:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 58663 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8D2423858018 for ; Tue, 11 Oct 2022 18:48:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8D2423858018 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1665514116; bh=GUeu4OlVV3ue2x9wq9FnqO5cCdgzuc9eruC/yytR3v0=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=WTjHsm6c20USBleuhY3zKxH9ohFAphseMQLhYiBhprffV+NZ3C2RkIUYfkXp6PYTU CwSb8KcMA9/mrI7WcEdm/BaY5Rdf13vu6MnrzE8x+uHq3l8a57K0SiCI8HElsu/KzT 3arp56YjscLw0WaragsQg4ZGtKu17v9QWeeo/PRw= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by sourceware.org (Postfix) with ESMTPS id AF9C03858D28; Tue, 11 Oct 2022 18:47:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AF9C03858D28 X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [93.207.82.174] ([93.207.82.174]) by web-mail.gmx.net (3c-app-gmx-bap36.server.lan [172.19.172.106]) (via HTTP); Tue, 11 Oct 2022 20:47:56 +0200 MIME-Version: 1.0 Message-ID: To: fortran , gcc-patches Subject: [PATCH] Fortran: check types of source expressions before conversion [PR107215] Date: Tue, 11 Oct 2022 20:47:56 +0200 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:P2OmYq1ezuqYhmxNGYok2UCy2yFIRzHPwXHPwis9URH9Rrg1pwmztR6E59q3fEH95XHbw bDAztzm8sy+lRpf7bkJe+B55AAd7HbjmD3P8KNUcRgh88FLGoAdrCS2fpqpcSEfXrIIUfQ0INrJ4 KM4uN7xT0FIxWOgmMf9n0TGVCuqhjva3u8O7uPEWQ+zjeiomZJPPEeJK6KMWp7maEjZtmx4z/d92 +YQu/0oRtedozo+l36jEHOFFD3dFkKbN3iVzWmAW0gLOijGL4h4dFb+60EoJMriN2B4DOmo1C7ao Zk= X-UI-Out-Filterresults: notjunk:1;V03:K0:2GacvSIaB90=:rr2Lz83vE13TdN+AyHt758 FEnosF2z3CfktH0EzdVMt+Ochhj3oHl6fna95bDQPVA4mZOJscAkjLD9z0MmDj9TE2UXgIfAd eoG+eenYOtA2MI6OUqtZOGD1oxFsc4g1LYTYvrOk5OiwEh2GvFhlzbolKbQz8wrMdgJ6UVUtA AUSjXbGGgE4Oi9Erfa1c9I9qC9GQgI0uRw46qgt5leQKaq7lkpx5t4lQlZWxgFkTLr7swh3Hf Vqcyu3i/+RpJGOLYgyu+GkeuLKpHKQY9wusT7LPrEdjT3C9ZdI7aD3V6bD7xIjwhvftcOy2Nj NiqTxqf8mDWUgE7YwT4/ko8ErQIX+I4pydJMNlqsLFaPwGUop7qpGrYwPVe5KlRFPxruvBtfw arTrgPeCX8AcgVLKEj8DOfVB5o4D3kHQF6+aVxafajrJYF04fcvSGgIM0EqtDoIIUpytbr8TE /m7v9zuL934/Y4re0OrCjWYBJSWY+utzqMLzv5sPKuiSfC+9sLDszykIS40w4K9iwitpRtqst noJtOYQ2qImkKn49xJYs1feZJzl4Q7REIL4to7c+6UYoslOb5krwHsKYEzEmUqgv/YQMJUAee MJjDv0SytBDvrRclbqyEj4oDnHZG2vrCpcmfUGS5YldT+IhZc+alhbFNZg7Qd+ip8Zuk5+HnD me9yg6yShRSaRoPRzYzvwdZ2dEQ5GIPYsUMneuebHx0qj0kBjsAq6bHr+3jKVZwbdoq7gqNjb L0fFs0ChHQkkpRZIsKdONGQ0mYyOwZ0cEdhESX+Jola1ZwcNQQkGm1NG9zJ/xDz+w0ywlpUNm oZMov7dr8ndkoGyBSywcxVStsNH4hlYIHVWfqKzhbI4Z/5Wm9TLJ9JCxevgKfjd7gxS+frsyh 23ZjWefZSnkl8qeIUXvlrTBt2ZtE+yGa5fpt1pPO4e7AT1i1UNsTXqG5dhGN+ZKrYkFB47Qf2 uamnxVXH5WDJc3QKPJFZ1Z7Im8Kj1DH3P17VFtSGIaj1OkDw+xJs5hw8ADrlSems6tGU/KtM0 M10BfzgK1MBFffpdohrm9Fy1TUsMVcDebf7HdVZH+YhEzLxeqUbPIdP4pY95hFSNK0TxgtUv2 4G/Vle68lRj8EXETKR0zvMDxMy5oYPYaqvRojXIJauG67MPGFmB/6322ey7y2pCKV8b3UVwAq 3Sm6WVkGLAx78jUEYbSIcJ7QiZLgP2g7X5Ebcek1skYACyyv4rcbfeqh45pAst2vUqzY0XfQv t58XiZb/aMZrriZH4nEUDj8fDGMC3So/7cyvcE72py7wfuUwas1LIuapg8eYrZmWsgzuNcfgn yzrDOzHx X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Harald Anlauf via Gcc-patches From: Harald Anlauf Reply-To: Harald Anlauf Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Dear all, this PR is an obvious followup to PR107000, where invalid types appeared in array constructors and lead to an ICE either in a conversion or reduction of a unary or binary expression. The present PR shows that several other conversions need to be protected by a check of the type of the source expression. Regtested on x86_64-pc-linux-gnu. OK for mainline? Thanks, Harald From 87dae7eb9d4cc76060d258ba99bc53f62c7130f2 Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Tue, 11 Oct 2022 20:37:42 +0200 Subject: [PATCH] Fortran: check types of source expressions before conversion [PR107215] gcc/fortran/ChangeLog: PR fortran/107215 * arith.cc (gfc_int2int): Check validity of type of source expr. (gfc_int2real): Likewise. (gfc_int2complex): Likewise. (gfc_real2int): Likewise. (gfc_real2real): Likewise. (gfc_complex2int): Likewise. (gfc_complex2real): Likewise. (gfc_complex2complex): Likewise. (gfc_log2log): Likewise. (gfc_log2int): Likewise. (gfc_int2log): Likewise. gcc/testsuite/ChangeLog: PR fortran/107215 * gfortran.dg/pr107215.f90: New test. --- gcc/fortran/arith.cc | 33 ++++++++++++++++++++++++++ gcc/testsuite/gfortran.dg/pr107215.f90 | 17 +++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/pr107215.f90 diff --git a/gcc/fortran/arith.cc b/gcc/fortran/arith.cc index 086b1f856b1..9e079e42995 100644 --- a/gcc/fortran/arith.cc +++ b/gcc/fortran/arith.cc @@ -2040,6 +2040,9 @@ gfc_int2int (gfc_expr *src, int kind) gfc_expr *result; arith rc; + if (src->ts.type != BT_INTEGER) + return NULL; + result = gfc_get_constant_expr (BT_INTEGER, kind, &src->where); mpz_set (result->value.integer, src->value.integer); @@ -2085,6 +2088,9 @@ gfc_int2real (gfc_expr *src, int kind) gfc_expr *result; arith rc; + if (src->ts.type != BT_INTEGER) + return NULL; + result = gfc_get_constant_expr (BT_REAL, kind, &src->where); mpfr_set_z (result->value.real, src->value.integer, GFC_RND_MODE); @@ -2116,6 +2122,9 @@ gfc_int2complex (gfc_expr *src, int kind) gfc_expr *result; arith rc; + if (src->ts.type != BT_INTEGER) + return NULL; + result = gfc_get_constant_expr (BT_COMPLEX, kind, &src->where); mpc_set_z (result->value.complex, src->value.integer, GFC_MPC_RND_MODE); @@ -2150,6 +2159,9 @@ gfc_real2int (gfc_expr *src, int kind) arith rc; bool did_warn = false; + if (src->ts.type != BT_REAL) + return NULL; + result = gfc_get_constant_expr (BT_INTEGER, kind, &src->where); gfc_mpfr_to_mpz (result->value.integer, src->value.real, &src->where); @@ -2196,6 +2208,9 @@ gfc_real2real (gfc_expr *src, int kind) arith rc; bool did_warn = false; + if (src->ts.type != BT_REAL) + return NULL; + result = gfc_get_constant_expr (BT_REAL, kind, &src->where); mpfr_set (result->value.real, src->value.real, GFC_RND_MODE); @@ -2310,6 +2325,9 @@ gfc_complex2int (gfc_expr *src, int kind) arith rc; bool did_warn = false; + if (src->ts.type != BT_COMPLEX) + return NULL; + result = gfc_get_constant_expr (BT_INTEGER, kind, &src->where); gfc_mpfr_to_mpz (result->value.integer, mpc_realref (src->value.complex), @@ -2372,6 +2390,9 @@ gfc_complex2real (gfc_expr *src, int kind) arith rc; bool did_warn = false; + if (src->ts.type != BT_COMPLEX) + return NULL; + result = gfc_get_constant_expr (BT_REAL, kind, &src->where); mpc_real (result->value.real, src->value.complex, GFC_RND_MODE); @@ -2439,6 +2460,9 @@ gfc_complex2complex (gfc_expr *src, int kind) arith rc; bool did_warn = false; + if (src->ts.type != BT_COMPLEX) + return NULL; + result = gfc_get_constant_expr (BT_COMPLEX, kind, &src->where); mpc_set (result->value.complex, src->value.complex, GFC_MPC_RND_MODE); @@ -2504,6 +2528,9 @@ gfc_log2log (gfc_expr *src, int kind) { gfc_expr *result; + if (src->ts.type != BT_LOGICAL) + return NULL; + result = gfc_get_constant_expr (BT_LOGICAL, kind, &src->where); result->value.logical = src->value.logical; @@ -2518,6 +2545,9 @@ gfc_log2int (gfc_expr *src, int kind) { gfc_expr *result; + if (src->ts.type != BT_LOGICAL) + return NULL; + result = gfc_get_constant_expr (BT_INTEGER, kind, &src->where); mpz_set_si (result->value.integer, src->value.logical); @@ -2532,6 +2562,9 @@ gfc_int2log (gfc_expr *src, int kind) { gfc_expr *result; + if (src->ts.type != BT_INTEGER) + return NULL; + result = gfc_get_constant_expr (BT_LOGICAL, kind, &src->where); result->value.logical = (mpz_cmp_si (src->value.integer, 0) != 0); diff --git a/gcc/testsuite/gfortran.dg/pr107215.f90 b/gcc/testsuite/gfortran.dg/pr107215.f90 new file mode 100644 index 00000000000..2c2a0ca7502 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr107215.f90 @@ -0,0 +1,17 @@ +! { dg-do compile } +! PR fortran/107215 - ICE in gfc_real2real and gfc_complex2complex +! Contributed by G.Steinmetz + +program p + double precision, parameter :: z = 1.0d0 + complex :: x(1) + real :: y(1) + x = [real :: -'1'] * z ! { dg-error "Operand of unary numeric operator" } + y = z * [real :: -'1'] ! { dg-error "Operand of unary numeric operator" } + x = [real :: -(.true.)] * z ! { dg-error "Operand of unary numeric operator" } + y = z * [real :: -(.true.)] ! { dg-error "Operand of unary numeric operator" } + x = [complex :: -'1'] * z ! { dg-error "Operand of unary numeric operator" } + y = z * [complex :: -'1'] ! { dg-error "Operand of unary numeric operator" } + x = [complex :: -(.true.)] * z ! { dg-error "Operand of unary numeric operator" } + y = z * [complex :: -(.true.)] ! { dg-error "Operand of unary numeric operator" } +end -- 2.35.3