Re: [gomp4] backport trunk FE changes

[Thomas Schwinge <thomas at codesourcery dot com>]

Hi!

On Fri, 6 Nov 2015 15:31:23 -0800, Cesar Philippidis <cesar@codesourcery.com> wrote:
> I've applied this patch to gomp-4_0-branch which backports most of my
> front end changes from trunk.

> --- a/gcc/cp/pt.c
> +++ b/gcc/cp/pt.c
> @@ -14398,7 +14398,6 @@ tsubst_omp_clauses (tree clauses, bool declare_simd, bool allow_fields,
>  	case OMP_CLAUSE_NUM_GANGS:
>  	case OMP_CLAUSE_NUM_WORKERS:
>  	case OMP_CLAUSE_VECTOR_LENGTH:
> -	case OMP_CLAUSE_GANG:
>  	case OMP_CLAUSE_WORKER:
>  	case OMP_CLAUSE_VECTOR:
>  	case OMP_CLAUSE_ASYNC:
> @@ -14427,7 +14426,7 @@ tsubst_omp_clauses (tree clauses, bool declare_simd, bool allow_fields,
>  	    = tsubst_omp_clause_decl (OMP_CLAUSE_DECL (oc), args, complain,
>  				      in_decl);
>  	  break;
> -	case OMP_CLAUSE_LINEAR:
> +	case OMP_CLAUSE_GANG:
>  	case OMP_CLAUSE_ALIGNED:
>  	  OMP_CLAUSE_DECL (nc)
>  	    = tsubst_omp_clause_decl (OMP_CLAUSE_DECL (oc), args, complain,

This -- unintentional, I suppose ;-) -- removal of OMP_CLAUSE_LINEAR
caused a lot of regressions; committed to gomp-4_0-branch in r229928:

commit eb7d11e41c53d5585db139e38de365fa445177b4
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Sat Nov 7 12:28:35 2015 +0000

    Restore OMP_CLAUSE_LINEAR handling in C++ template parameter replacement
    
    	gcc/cp/
    	* pt.c (tsubst_omp_clauses): Handle OMP_CLAUSE_LINEAR.
    
    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@229928 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/cp/ChangeLog.gomp | 4 ++++
 gcc/cp/pt.c           | 1 +
 2 files changed, 5 insertions(+)

diff --git gcc/cp/ChangeLog.gomp gcc/cp/ChangeLog.gomp
index 62a91d5..a7b9609 100644
--- gcc/cp/ChangeLog.gomp
+++ gcc/cp/ChangeLog.gomp
@@ -1,3 +1,7 @@
+2015-11-07  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* pt.c (tsubst_omp_clauses): Handle OMP_CLAUSE_LINEAR.
+
 2015-11-06  Cesar Philippidis  <cesar@codesourcery.com>
 
 	* parser.c (cp_parser_oacc_shape_clause): Allow pointers arguments to
diff --git gcc/cp/pt.c gcc/cp/pt.c
index 1a45d8d..4a2c02b 100644
--- gcc/cp/pt.c
+++ gcc/cp/pt.c
@@ -14427,6 +14427,7 @@ tsubst_omp_clauses (tree clauses, bool declare_simd, bool allow_fields,
 				      in_decl);
 	  break;
 	case OMP_CLAUSE_GANG:
+	case OMP_CLAUSE_LINEAR:
 	case OMP_CLAUSE_ALIGNED:
 	  OMP_CLAUSE_DECL (nc)
 	    = tsubst_omp_clause_decl (OMP_CLAUSE_DECL (oc), args, complain,


GrÃÃe
 Thomas

Attachment: signature.asc
Description: PGP signature