procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fortran: check types of operands of arithmetic binary operations [PR107217]

Browse source 
gcc/fortran/ChangeLog:

	PR fortran/107217
	* arith.cc (gfc_arith_plus): Compare consistency of types of operands.
	(gfc_arith_minus): Likewise.
	(gfc_arith_times): Likewise.
	(gfc_arith_divide): Likewise.
	(arith_power): Check that both operands are of numeric type.

gcc/testsuite/ChangeLog:

	PR fortran/107217
	* gfortran.dg/pr107217.f90: New test.
This commit is contained in:
Harald Anlauf 2022-10-11 22:08:48 +02:00
parent caf9db5a7f
commit 7858368c3f
2 changed files with 33 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gcc/fortran/arith.cc
View file

@ -624,6 +624,9 @@ gfc_arith_plus (gfc_expr *op1, gfc_expr *op2, gfc_expr **resultp)
gfc_expr *result;
arith rc;
if (op1->ts.type != op2->ts.type)
return ARITH_INVALID_TYPE;
result = gfc_get_constant_expr (op1->ts.type, op1->ts.kind, &op1->where);
switch (op1->ts.type)
@ -658,6 +661,9 @@ gfc_arith_minus (gfc_expr *op1, gfc_expr *op2, gfc_expr **resultp)
gfc_expr *result;
arith rc;
if (op1->ts.type != op2->ts.type)
return ARITH_INVALID_TYPE;
result = gfc_get_constant_expr (op1->ts.type, op1->ts.kind, &op1->where);
switch (op1->ts.type)
@ -692,6 +698,9 @@ gfc_arith_times (gfc_expr *op1, gfc_expr *op2, gfc_expr **resultp)
gfc_expr *result;
arith rc;
if (op1->ts.type != op2->ts.type)
return ARITH_INVALID_TYPE;
result = gfc_get_constant_expr (op1->ts.type, op1->ts.kind, &op1->where);
switch (op1->ts.type)
@ -727,6 +736,9 @@ gfc_arith_divide (gfc_expr *op1, gfc_expr *op2, gfc_expr **resultp)
gfc_expr *result;
arith rc;
if (op1->ts.type != op2->ts.type)
return ARITH_INVALID_TYPE;
rc = ARITH_OK;
result = gfc_get_constant_expr (op1->ts.type, op1->ts.kind, &op1->where);
@ -815,6 +827,9 @@ arith_power (gfc_expr *op1, gfc_expr *op2, gfc_expr **resultp)
gfc_expr *result;
arith rc;
if (!gfc_numeric_ts (&op1->ts) || !gfc_numeric_ts (&op2->ts))
return ARITH_INVALID_TYPE;
rc = ARITH_OK;
result = gfc_get_constant_expr (op1->ts.type, op1->ts.kind, &op1->where);

18
gcc/testsuite/gfortran.dg/pr107217.f90 Normal file
View file

@ -0,0 +1,18 @@
! { dg-do compile }
! PR fortran/107217 - ICE in gfc_arith_times
! Contributed by G.Steinmetz
program p
print *, [real :: (['1'])] * 2 ! { dg-error "Cannot convert" }
print *, 2 * [real :: (['1'])] ! { dg-error "Cannot convert" }
print *, [real :: (['1'])] + 2 ! { dg-error "Cannot convert" }
print *, [real :: (['1'])] - 2 ! { dg-error "Cannot convert" }
print *, [real :: (['1'])] / 2 ! { dg-error "Cannot convert" }
print *, 1 / [real :: (['1'])] ! { dg-error "Cannot convert" }
print *, [real :: (['1'])] ** 2 ! { dg-error "Cannot convert" }
print *, 2 ** [real :: (['1'])] ! { dg-error "Cannot convert" }
print *, 2.0 ** [real :: (.true.)] ! { dg-error "Cannot convert" }
print *, [real :: (.true.)] ** 2.0 ! { dg-error "Cannot convert" }
print *, [complex :: (['1'])] ** (1.0,2.0) ! { dg-error "Cannot convert" }
print *, (1.0,2.0) ** [complex :: (['1'])] ! { dg-error "Cannot convert" }
end