diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/expr.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/logical_data_1.f90 | 9 |
4 files changed, 22 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 18b7753..dc5f01e 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2005-01-29 Steven G. Kargl <kargls@comcast.net> + + PR fortran/19589 + * expr.c (gfc_check_assign): Check for conformance of logical operands + 2004-01-27 Steven Bosscher <stevenb@suse.de> * trans-decl.c (gfc_build_label_decl): Set DECL_ARTIFICAL and diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index c71c4a1..87ce3e5 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -1820,6 +1820,9 @@ gfc_check_assign (gfc_expr * lvalue, gfc_expr * rvalue, int conform) if (gfc_numeric_ts (&lvalue->ts) && gfc_numeric_ts (&rvalue->ts)) return SUCCESS; + if (lvalue->ts.type == BT_LOGICAL && rvalue->ts.type == BT_LOGICAL) + return SUCCESS; + gfc_error ("Incompatible types in assignment at %L, %s to %s", &rvalue->where, gfc_typename (&rvalue->ts), gfc_typename (&lvalue->ts)); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index dd24748..edd525a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2005-01-29 Steven G. Kargl <kargls@comcast.net> + + PR fortran/19589 + * gfortran.dg/logical_data_1.f90: New test. + 2005-01-28 Mark Mitchell <mark@codesourcery.com> PR c++/19253 diff --git a/gcc/testsuite/gfortran.dg/logical_data_1.f90 b/gcc/testsuite/gfortran.dg/logical_data_1.f90 new file mode 100644 index 0000000..b9190d2 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/logical_data_1.f90 @@ -0,0 +1,9 @@ +! { dg-do compile } +! PR19589 +! Logical objects/values with differing type kinds were being rejected in +! data statements. +program logical_data_1 + logical(kind=4) :: a + logical(kind=8) :: b + data a, b /.true., .false./ +end program |