From: Andrew Stubbs <ams@codesourcery.com>
Date: Fri, 5 Jul 2019 16:00:46 +0000 (+0000)
Subject: Tweak error message for mapped parameters.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d73fe949b361a6aa40abc78a86413e5169ab0f4e;p=thirdparty%2Fgcc.git

Tweak error message for mapped parameters.

2019-09-06  Andrew Stubbs  <ams@codesourcery.com>

	Backport from mainline:

	2019-07-05  Andrew Stubbs  <ams@codesourcery.com>

	gcc/fortran/
	* openmp.c (resolve_omp_clauses): Add custom error messages for
	parameters in map clauses.

(cherry picked from openacc-gcc-9-branch commit
7ed5fa7ae91f1c504d7c1b750a10647b27fdf954)
---

diff --git a/gcc/fortran/ChangeLog.omp b/gcc/fortran/ChangeLog.omp
index c8456e4bd0a4..576e33fd567f 100644
--- a/gcc/fortran/ChangeLog.omp
+++ b/gcc/fortran/ChangeLog.omp
@@ -1,3 +1,12 @@
+2019-09-06  Andrew Stubbs  <ams@codesourcery.com>
+
+	Backport from mainline:
+
+	2019-07-05  Andrew Stubbs  <ams@codesourcery.com>
+
+	* openmp.c (resolve_omp_clauses): Add custom error messages for
+	parameters in map clauses.
+
 2019-07-10  Julian Brown  <julian@codesourcery.com>
 
 	* trans-openmp.c (gfc_omp_finish_clause): Change clauses mapping
diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c
index adf8d4240f7c..fa0cd6f84a37 100644
--- a/gcc/fortran/openmp.c
+++ b/gcc/fortran/openmp.c
@@ -4279,8 +4279,21 @@ resolve_omp_clauses (gfc_code *code, gfc_omp_clauses *omp_clauses,
 		  continue;
 	      }
 	  }
-	gfc_error ("Object %qs is not a variable at %L", n->sym->name,
-		   &n->where);
+	if (list == OMP_LIST_MAP
+	    && n->sym->attr.flavor == FL_PARAMETER)
+	  {
+	    if (openacc)
+	      gfc_error ("Object %qs is not a variable at %L; parameters"
+			 " cannot be and need not be copied", n->sym->name,
+			 &n->where);
+	    else
+	      gfc_error ("Object %qs is not a variable at %L; parameters"
+			 " cannot be and need not be mapped", n->sym->name,
+			 &n->where);
+	  }
+	else
+	  gfc_error ("Object %qs is not a variable at %L", n->sym->name,
+		     &n->where);
       }
 
   for (list = 0; list < OMP_LIST_NUM; list++)