On Wed, Jul 25, 2018 at 08:29:17AM -0700, Cesar Philippidis wrote:
> The fortran FE incorrectly records the line locations of combined acc
> loop directives when it lowers the construct to gimple. Usually this
> isn't a problem because the fortran FE is able to report problems with
> acc loops itself. However, there will be inaccuracies if the ME tries
> to use those locations.
>
> Note that test cases are inconspicuously absent in this patch.
> However, without this bug fix, -fopt-info-note-omp will report bogus
> line numbers. This code patch will be tested in a later patch in
> this series.
>
> Is this OK for trunk? I bootstrapped and regtested it on x86_64 with
> nvptx offloading.
>
> Thanks,
> Cesar
>
> 2018-XX-YY Cesar Philippidis <ce...@codesourcery.com>
>
> gcc/fortran/
> * trans-openmp.c (gfc_trans_oacc_combined_directive): Set the
> location of combined acc loops.
>
> (cherry picked from gomp-4_0-branch r245653)
>
> diff --git a/gcc/fortran/trans-openmp.c b/gcc/fortran/trans-openmp.c
> index f038f4c..e7707d0 100644
> --- a/gcc/fortran/trans-openmp.c
> +++ b/gcc/fortran/trans-openmp.c
> @@ -3869,6 +3869,7 @@ gfc_trans_oacc_combined_directive (gfc_code *code)
> gfc_omp_clauses construct_clauses, loop_clauses;
> tree stmt, oacc_clauses = NULL_TREE;
> enum tree_code construct_code;
> + location_t loc = input_location;
>
> switch (code->op)
> {
> @@ -3930,12 +3931,16 @@ gfc_trans_oacc_combined_directive (gfc_code *code)
> else
> pushlevel ();
> stmt = gfc_trans_omp_do (code, EXEC_OACC_LOOP, pblock, &loop_clauses,
> NULL);
> +
> + if (CAN_HAVE_LOCATION_P (stmt))
> + SET_EXPR_LOCATION (stmt, loc);
This is protected_set_expr_location.
Marek
