diff options
| author | Tobias Burnus <burnus@net-b.de> | 2012-09-15 17:44:22 +0200 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2012-09-15 17:44:22 +0200 |
| commit | fc2655fb3082182075b288b58c93ac563ef661a0 (patch) | |
| tree | cbc423f1f72886520c3332a55320578a49eb12e1 /gcc/fortran/array.c | |
| parent | fd2805e11b7018a148a4f87201b4d85344b5aad4 (diff) | |
| download | gcc-fc2655fb3082182075b288b58c93ac563ef661a0.zip gcc-fc2655fb3082182075b288b58c93ac563ef661a0.tar.gz gcc-fc2655fb3082182075b288b58c93ac563ef661a0.tar.bz2 | |
arith.c (arith_power): Call gfc_free_expr in case of error.
2012-09-15 Tobias Burnus <burnus@net-b.de>
* arith.c (arith_power): Call gfc_free_expr in case of error.
* array.c (gfc_match_array_constructor): Initialize variable.
(gfc_resolve_character_array_constructor): Remove superfluous check.
(gfc_array_dimen_size): Add assert.
* check.c (numeric_check): Fix implicit typing.
* class.c (gfc_build_class_symbol): Add assert.
(finalize_component): Free memory.
* dump-parse-tree.c (show_namespace): Add assert.
* trans-io.c (transfer_namelist_element, transfer_expr): Avoid
memory leakage.
(gfc_trans_transfer): Add assert.
* trans.c (gfc_trans_runtime_check): Call va_end
From-SVN: r191344
Diffstat (limited to 'gcc/fortran/array.c')
| -rw-r--r-- | gcc/fortran/array.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c index 44ec72e..066ac1e 100644 --- a/gcc/fortran/array.c +++ b/gcc/fortran/array.c @@ -1074,6 +1074,7 @@ gfc_match_array_constructor (gfc_expr **result) seen_ts = false; /* Try to match an optional "type-spec ::" */ + gfc_clear_ts (&ts); if (gfc_match_decl_type_spec (&ts, 0) == MATCH_YES) { seen_ts = (gfc_match (" ::") == MATCH_YES); @@ -1973,7 +1974,7 @@ got_charlen: /* If gfc_extract_int above set current_length, we implicitly know the type is BT_INTEGER and it's EXPR_CONSTANT. */ - has_ts = (expr->ts.u.cl && expr->ts.u.cl->length_from_typespec); + has_ts = expr->ts.u.cl->length_from_typespec; if (! cl || (current_length != -1 && current_length != found_length)) @@ -2225,13 +2226,15 @@ gfc_array_dimen_size (gfc_expr *array, int dimen, mpz_t *result) gfc_ref *ref; int i; + gcc_assert (array != NULL); + if (array->ts.type == BT_CLASS) return FAILURE; if (array->rank == -1) return FAILURE; - if (dimen < 0 || array == NULL || dimen > array->rank - 1) + if (dimen < 0 || dimen > array->rank - 1) gfc_internal_error ("gfc_array_dimen_size(): Bad dimension"); switch (array->expr_type) |