aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven G. Kargl <kargl@gcc.gnu.org>2016-10-28 23:37:03 +0000
committerSteven G. Kargl <kargl@gcc.gnu.org>2016-10-28 23:37:03 +0000
commitfdfc9e44c51d32b48ba25d8af2108b38d19c5f69 (patch)
tree14dc59fbb964d58a50d068ff4033d59d2a1a95ac
parent94f56408db96e2e12f6e1322ed2c1c465df934f6 (diff)
downloadgcc-fdfc9e44c51d32b48ba25d8af2108b38d19c5f69.zip
gcc-fdfc9e44c51d32b48ba25d8af2108b38d19c5f69.tar.gz
gcc-fdfc9e44c51d32b48ba25d8af2108b38d19c5f69.tar.bz2
re PR fortran/71891 (fortran/symbol.c:4864: suspicious if ?)
2016-10-28 Steven G. Kargl <kargl@gcc.gnu.org> PR fortran/71891 * symbol.c (gfc_type_compatible): Fix typo. From-SVN: r241668
-rw-r--r--gcc/fortran/ChangeLog5
-rw-r--r--gcc/fortran/symbol.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 625189f..684af2f 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2016-10-28 Steven G. Kargl <kargl@gcc.gnu.org>
+
+ PR fortran/71891
+ * symbol.c (gfc_type_compatible): Fix typo.
+
2016-10-27 Jakub Jelinek <jakub@redhat.com>
PR fortran/78026
diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c
index cbe4347..85ed375 100644
--- a/gcc/fortran/symbol.c
+++ b/gcc/fortran/symbol.c
@@ -4901,7 +4901,7 @@ gfc_type_compatible (gfc_typespec *ts1, gfc_typespec *ts2)
&& !is_union1 && !is_union2)
return (ts1->type == ts2->type);
- if ((is_derived1 && is_derived2) || (is_union1 && is_union1))
+ if ((is_derived1 && is_derived2) || (is_union1 && is_union2))
return gfc_compare_derived_types (ts1->u.derived, ts2->u.derived);
if (is_derived1 && is_class2)