diff options
| author | Tobias Burnus <burnus@net-b.de> | 2010-09-10 08:01:50 +0200 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2010-09-10 08:01:50 +0200 |
| commit | 5d44e5c8398ca39f0cfdc33ff1470d17132b2af3 (patch) | |
| tree | 46dfd2506be1556f07f9559109074d19c8c2de57 /gcc/fortran/trans-array.c | |
| parent | 63d1822fccfef3fc2f35392386b894604cbca465 (diff) | |
| download | gcc-5d44e5c8398ca39f0cfdc33ff1470d17132b2af3.zip gcc-5d44e5c8398ca39f0cfdc33ff1470d17132b2af3.tar.gz gcc-5d44e5c8398ca39f0cfdc33ff1470d17132b2af3.tar.bz2 | |
re PR fortran/45186 (Gfortran 4.5.0 emits wrong linenumbers)
2010-09-10 Tobias Burnus <burnus@net-b.de>
PR fortran/45186
* trans.h (build1_stat_loc, build2_stat_loc, build3_stat_loc,
build4_stat_loc): New inline functions.
(build1_loc, build2_loc, build3_loc, build4_loc): New macros.
(build1_v, build2_v, build3_v, build4_v): Use input_location
as locus.
* trans-array.c (gfc_trans_scalarized_loop_end,
gfc_conv_array_parameter): Replace build[1-4] by build[1-4]_loc.
* trans.c (gfc_build_addr_expr, gfc_build_array_ref,
gfc_finish_wrapped_block): Ditto.
* trans-decl.c (gfc_init_default_dt, init_intent_out_dt): Ditto.
* trans-expr.c (gfc_conv_missing_dummy,
gfc_trans_alloc_subarray_assign, gfc_trans_zero_assign): Ditto.
* trans-openmp.c (gfc_omp_clause_default_ctor,
gfc_trans_omp_critical, gfc_trans_omp_parallel,
gfc_trans_omp_parallel_do, gfc_trans_omp_parallel_sections,
gfc_trans_omp_parallel_workshare, gfc_trans_omp_sections
gfc_trans_omp_single, gfc_trans_omp_task,
gfc_trans_omp_workshare): Ditto.
From-SVN: r164143
Diffstat (limited to 'gcc/fortran/trans-array.c')
| -rw-r--r-- | gcc/fortran/trans-array.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 43cc8c4..44c47d7 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -2944,12 +2944,14 @@ gfc_trans_scalarized_loop_end (gfc_loopinfo * loop, int n, loop->from[n]); OMP_FOR_INIT (stmt) = init; /* The exit condition. */ - TREE_VEC_ELT (cond, 0) = build2 (LE_EXPR, boolean_type_node, - loop->loopvar[n], loop->to[n]); + TREE_VEC_ELT (cond, 0) = build2_loc (input_location, LE_EXPR, + boolean_type_node, + loop->loopvar[n], loop->to[n]); + SET_EXPR_LOCATION (TREE_VEC_ELT (cond, 0), input_location); OMP_FOR_COND (stmt) = cond; /* Increment the loopvar. */ - tmp = build2 (PLUS_EXPR, gfc_array_index_type, - loop->loopvar[n], gfc_index_one_node); + tmp = build2_loc (input_location, PLUS_EXPR, gfc_array_index_type, + loop->loopvar[n], gfc_index_one_node); TREE_VEC_ELT (incr, 0) = fold_build2_loc (input_location, MODIFY_EXPR, void_type_node, loop->loopvar[n], tmp); OMP_FOR_INCR (stmt) = incr; @@ -5931,8 +5933,8 @@ gfc_conv_array_parameter (gfc_se * se, gfc_expr * expr, gfc_ss * ss, bool g77, if (fsym && fsym->attr.optional && sym && sym->attr.optional) { tmp = gfc_conv_expr_present (sym); - ptr = build3 (COND_EXPR, TREE_TYPE (se->expr), tmp, - fold_convert (TREE_TYPE (se->expr), ptr), + ptr = build3_loc (input_location, COND_EXPR, TREE_TYPE (se->expr), + tmp, fold_convert (TREE_TYPE (se->expr), ptr), fold_convert (TREE_TYPE (se->expr), null_pointer_node)); } |