aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorPaul Thomas <pault@gcc.gnu.org>2018-01-13 13:52:34 +0000
committerPaul Thomas <pault@gcc.gnu.org>2018-01-13 13:52:34 +0000
commit567a6e1cdb3cae09ae74bdd528fd31c0b4956ad2 (patch)
treea382870fea24ff5a8345e401de81e482bb901fde /gcc/fortran
parent700b62ccf29e12b68029883b5c1e69f151c4e512 (diff)
downloadgcc-567a6e1cdb3cae09ae74bdd528fd31c0b4956ad2.zip
gcc-567a6e1cdb3cae09ae74bdd528fd31c0b4956ad2.tar.gz
gcc-567a6e1cdb3cae09ae74bdd528fd31c0b4956ad2.tar.bz2
re PR fortran/52162 (Bogus -fcheck=bounds with realloc on assignment to unallocated LHS)
2018-01-13 Paul Thomas <pault@gcc.gnu.org> PR fortran/52162 * trans-expr.c (gfc_trans_scalar_assign): Flag is_alloc_lhs if the rhs expression is neither an elemental nor a conversion function. PR fortran/83622 * trans-array.c (is_pointer_array): Remove unconditional return of false for -fopenmp. 2018-01-13 Paul Thomas <pault@gcc.gnu.org> PR fortran/52162 * gfortran.dg/bounds_check_19.f90 : New test. From-SVN: r256607
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/ChangeLog11
-rw-r--r--gcc/fortran/trans-array.c3
-rw-r--r--gcc/fortran/trans-expr.c7
3 files changed, 16 insertions, 5 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 8f32e07..1e421d9 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,14 @@
+2018-01-13 Paul Thomas <pault@gcc.gnu.org>
+
+ PR fortran/52162
+ * trans-expr.c (gfc_trans_scalar_assign): Flag is_alloc_lhs if
+ the rhs expression is neither an elemental nor a conversion
+ function.
+
+ PR fortran/83622
+ * trans-array.c (is_pointer_array): Remove unconditional return
+ of false for -fopenmp.
+
2018-01-13 Thomas Koenig <tkoenig@gcc.gnu.org>
<emsr@gcc.gnu.org>
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index e35e0c9..0cf1831 100644
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -786,9 +786,6 @@ gfc_add_ss_to_loop (gfc_loopinfo * loop, gfc_ss * head)
static bool
is_pointer_array (tree expr)
{
- if (flag_openmp)
- return false;
-
if (expr == NULL_TREE
|| !GFC_DESCRIPTOR_TYPE_P (TREE_TYPE (expr))
|| GFC_CLASS_TYPE_P (TREE_TYPE (expr)))
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index add0d69..e90036f 100644
--- a/gcc/fortran/trans-expr.c
+++ b/gcc/fortran/trans-expr.c
@@ -9924,9 +9924,12 @@ gfc_trans_assignment_1 (gfc_expr * expr1, gfc_expr * expr2, bool init_flag,
/* Walk the lhs. */
lss = gfc_walk_expr (expr1);
if (gfc_is_reallocatable_lhs (expr1)
- && !(expr2->expr_type == EXPR_FUNCTION
- && expr2->value.function.isym != NULL))
+ && !(expr2->expr_type == EXPR_FUNCTION
+ && expr2->value.function.isym != NULL
+ && !(expr2->value.function.isym->elemental
+ || expr2->value.function.isym->conversion)))
lss->is_alloc_lhs = 1;
+
rss = NULL;
if ((expr1->ts.type == BT_DERIVED)