procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fortran/OpenMP: Add location data to 'sorry' [PR118740]

Browse source 
PR fortran/118740

gcc/fortran/ChangeLog:

	* openmp.cc (gfc_match_omp_context_selector, match_omp_metadirective):
	Change sorry to sorry_at and use gfc_current_locus as location.
	* trans-openmp.cc (gfc_trans_omp_clauses): Likewise, but use n->where.

gcc/testsuite/ChangeLog:

	* gfortran.dg/gomp/append_args-2.f90: Update for line change.
This commit is contained in:
Tobias Burnus 2025-02-05 14:03:47 +01:00
parent 6094801d6f
commit 6f95af4f22
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/fortran/openmp.cc
View file

@ -6536,7 +6536,8 @@ gfc_match_omp_context_selector (gfc_omp_set_selector *oss,
/* FIXME: The "requires" selector was added in OpenMP 5.1. /* FIXME: The "requires" selector was added in OpenMP 5.1.
Currently only the now-deprecated syntax Currently only the now-deprecated syntax
from OpenMP 5.0 is supported. */ from OpenMP 5.0 is supported. */
sorry ("%<requires%> selector is not supported yet"); sorry_at (gfc_get_location (&gfc_current_locus),
"%<requires%> selector is not supported yet");
return MATCH_ERROR; return MATCH_ERROR;
} }
else else
@ -6942,7 +6943,8 @@ match_omp_metadirective (bool begin_p)
gfc_matching_omp_context_selector = false; gfc_matching_omp_context_selector = false;
if (is_omp_declarative_stmt (directive)) if (is_omp_declarative_stmt (directive))
sorry ("declarative directive variants are not supported"); sorry_at (gfc_get_location (&gfc_current_locus),
"declarative directive variants are not supported");
if (gfc_error_flag_test ()) if (gfc_error_flag_test ())
{ {

8
gcc/fortran/trans-openmp.cc
View file

@ -3345,7 +3345,8 @@ gfc_trans_omp_clauses (stmtblock_t *block, gfc_omp_clauses *clauses,
if (openacc && n->sym->ts.type == BT_CLASS) if (openacc && n->sym->ts.type == BT_CLASS)
{ {
if (n->sym->attr.optional) if (n->sym->attr.optional)
sorry ("optional class parameter"); sorry_at (gfc_get_location (&n->where),
"optional class parameter");
tree ptr = gfc_class_data_get (decl); tree ptr = gfc_class_data_get (decl);
ptr = build_fold_indirect_ref (ptr); ptr = build_fold_indirect_ref (ptr);
OMP_CLAUSE_DECL (node) = ptr; OMP_CLAUSE_DECL (node) = ptr;
@ -3761,7 +3762,8 @@ gfc_trans_omp_clauses (stmtblock_t *block, gfc_omp_clauses *clauses,
gcc_assert (!ref->next); gcc_assert (!ref->next);
} }
else else
sorry ("unhandled expression type"); sorry_at (gfc_get_location (&n->where),
"unhandled expression type");
} }
tree inner = se.expr; tree inner = se.expr;
@ -4041,7 +4043,7 @@ gfc_trans_omp_clauses (stmtblock_t *block, gfc_omp_clauses *clauses,
gcc_unreachable (); gcc_unreachable ();
} }
else else
sorry ("unhandled expression"); sorry_at (gfc_get_location (&n->where), "unhandled expression");
finalize_map_clause: finalize_map_clause:

2
gcc/testsuite/gfortran.dg/gomp/append_args-2.f90
View file

@ -40,7 +40,7 @@ contains
subroutine f5 () subroutine f5 ()
!$omp declare variant (f1ox) match(user={condition(flag)}) & ! { dg-error "the 'append_args' clause can only be specified if the 'dispatch' selector of the construct selector set appears in the 'match' clause at .1." } !$omp declare variant (f1ox) match(user={condition(flag)}) & ! { dg-error "the 'append_args' clause can only be specified if the 'dispatch' selector of the construct selector set appears in the 'match' clause at .1." }
!$omp& append_args ( interop ( target , targetsync) ) !$omp& append_args ( interop ( target , targetsync) )
! { dg-error "'q' at .1. must be a nonpointer, nonallocatable scalar integer dummy argument of 'omp_interop_kind' kind as it utilized with the 'append_args' clause at .2." "" { target *-*-* } .-2 } ! { dg-error "'q' at .1. must be a nonpointer, nonallocatable scalar integer dummy argument of 'omp_interop_kind' kind as it utilized with the 'append_args' clause at .2." "" { target *-*-* } .-1 }
end subroutine end subroutine
subroutine f6 (x, y) subroutine f6 (x, y)