diff options
| author | Martin Liska <mliska@suse.cz> | 2016-06-16 14:21:55 +0200 |
|---|---|---|
| committer | Martin Liska <marxin@gcc.gnu.org> | 2016-06-16 12:21:55 +0000 |
| commit | 7f7fa20fdd7f13844868541c57063327bf3bec51 (patch) | |
| tree | b131ad95625b4a3221ddf076bbe3d9629b80aa69 /gcc/fortran | |
| parent | 73170f9e46783e03f96133d9ee96e96f8cd4fd38 (diff) | |
| download | gcc-7f7fa20fdd7f13844868541c57063327bf3bec51.zip gcc-7f7fa20fdd7f13844868541c57063327bf3bec51.tar.gz gcc-7f7fa20fdd7f13844868541c57063327bf3bec51.tar.bz2 | |
Fix code emission for FAIL_ALLOC predictor
* predict.def: Define a new predictor.
* trans-array.c (gfc_array_allocate): Do not generate expect
stmt.
* trans.c (gfc_allocate_using_malloc): Properly set FAIL_ALLOC
predictor for malloc return value.
(gfc_allocate_allocatable): Use REALLOC predictor instead of
FAIL_ALLOC.
(gfc_deallocate_with_status): Likewise.
From-SVN: r237524
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/fortran/trans-array.c | 2 | ||||
| -rw-r--r-- | gcc/fortran/trans.c | 10 |
3 files changed, 15 insertions, 7 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 998255a..9ba1554 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,13 @@ +2016-06-16 Martin Liska <mliska@suse.cz> + + * trans-array.c (gfc_array_allocate): Do not generate expect + stmt. + * trans.c (gfc_allocate_using_malloc): Properly set FAIL_ALLOC + predictor for malloc return value. + (gfc_allocate_allocatable): Use REALLOC predictor instead of + FAIL_ALLOC. + (gfc_deallocate_with_status): Likewise. + 2016-06-13 Paul Thomas <pault@gcc.gnu.org> PR fortran/70673 diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 403ce3a..e95c8dd 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -5553,7 +5553,7 @@ gfc_array_allocate (gfc_se * se, gfc_expr * expr, tree status, tree errmsg, build_int_cst (TREE_TYPE (status), 0)); gfc_add_expr_to_block (&se->pre, fold_build3_loc (input_location, COND_EXPR, void_type_node, - gfc_likely (cond, PRED_FORTRAN_FAIL_ALLOC), + cond, set_descriptor, build_empty_stmt (input_location))); } diff --git a/gcc/fortran/trans.c b/gcc/fortran/trans.c index c6688d3..d6b4a56 100644 --- a/gcc/fortran/trans.c +++ b/gcc/fortran/trans.c @@ -672,9 +672,6 @@ gfc_allocate_using_malloc (stmtblock_t * block, tree pointer, gfc_start_block (&on_error); if (status != NULL_TREE) { - gfc_add_expr_to_block (&on_error, - build_predict_expr (PRED_FORTRAN_FAIL_ALLOC, - NOT_TAKEN)); tmp = fold_build2_loc (input_location, MODIFY_EXPR, status_type, status, build_int_cst (status_type, LIBERROR_ALLOCATION)); gfc_add_expr_to_block (&on_error, tmp); @@ -693,7 +690,8 @@ gfc_allocate_using_malloc (stmtblock_t * block, tree pointer, boolean_type_node, pointer, build_int_cst (prvoid_type_node, 0)); tmp = fold_build3_loc (input_location, COND_EXPR, void_type_node, - error_cond, gfc_finish_block (&on_error), + gfc_unlikely (error_cond, PRED_FORTRAN_FAIL_ALLOC), + gfc_finish_block (&on_error), build_empty_stmt (input_location)); gfc_add_expr_to_block (block, tmp); @@ -796,7 +794,7 @@ gfc_allocate_allocatable (stmtblock_t * block, tree mem, tree size, tree token, null_mem = gfc_unlikely (fold_build2_loc (input_location, NE_EXPR, boolean_type_node, mem, build_int_cst (type, 0)), - PRED_FORTRAN_FAIL_ALLOC); + PRED_FORTRAN_REALLOC); /* If mem is NULL, we call gfc_allocate_using_malloc or gfc_allocate_using_lib. */ @@ -1385,7 +1383,7 @@ gfc_deallocate_with_status (tree pointer, tree status, tree errmsg, cond2 = fold_build2_loc (input_location, NE_EXPR, boolean_type_node, stat, build_zero_cst (TREE_TYPE (stat))); tmp = fold_build3_loc (input_location, COND_EXPR, void_type_node, - gfc_unlikely (cond2, PRED_FORTRAN_FAIL_ALLOC), + gfc_unlikely (cond2, PRED_FORTRAN_REALLOC), tmp, build_empty_stmt (input_location)); gfc_add_expr_to_block (&non_null, tmp); } |