public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r13-3238] Fortran: check types of source expressions before conversion [PR107215]
@ 2022-10-11 21:08 Harald Anlauf
  0 siblings, 0 replies; only message in thread
From: Harald Anlauf @ 2022-10-11 21:08 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:53955284c031a17e6e49e730ef8947fe557ff35e

commit r13-3238-g53955284c031a17e6e49e730ef8947fe557ff35e
Author: Harald Anlauf <anlauf@gmx.de>
Date:   Tue Oct 11 20:37:42 2022 +0200

    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.

Diff:
---
 gcc/fortran/arith.cc                   | 33 +++++++++++++++++++++++++++++++++
 gcc/testsuite/gfortran.dg/pr107215.f90 | 17 +++++++++++++++++
 2 files changed, 50 insertions(+)

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

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2022-10-11 21:08 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-11 21:08 [gcc r13-3238] Fortran: check types of source expressions before conversion [PR107215] Harald Anlauf

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).