https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60928

--- Comment #8 from Jakub Jelinek <jakub at gcc dot gnu.org> ---
Author: jakub
Date: Tue Jun 10 06:05:22 2014
New Revision: 211397

URL: http://gcc.gnu.org/viewcvs?rev=211397&root=gcc&view=rev
Log:
    PR fortran/60928
    * omp-low.c (lower_rec_input_clauses) <case OMP_CLAUSE_LASTPRIVATE>:
    Set lastprivate_firstprivate even if omp_private_outer_ref
    langhook returns true.
    <case OMP_CLAUSE_REDUCTION>: When calling omp_clause_default_ctor
    langhook, call unshare_expr on new_var and call
    build_outer_var_ref to get the last argument.
gcc/c-family/
    * c-pragma.c (omp_pragmas_simd): Move PRAGMA_OMP_TASK...
    (omp_pragmas): ... back here.
gcc/fortran/
    * f95-lang.c (gfc_init_builtin_functions): Handle -fopenmp-simd
    like -fopenmp.
    * openmp.c (resolve_omp_clauses): Remove allocatable components
    diagnostics.  Add associate-name and intent(in) pointer
    diagnostics for various clauses, diagnose procedure pointers in
    reduction clause.
    * parse.c (match_word_omp_simd): New function.
    (matchs, matcho): New macros.
    (decode_omp_directive): Change match macros to either matchs
    or matcho.  Handle -fopenmp-simd.
    (next_free, next_fixed): Handle -fopenmp-simd like -fopenmp.
    * scanner.c (skip_free_comments, skip_fixed_comments, include_line):
    Likewise.
    * trans-array.c (get_full_array_size): Rename to...
    (gfc_full_array_size): ... this.  No longer static.
    (duplicate_allocatable): Adjust caller.  Add NO_MEMCPY argument
    and handle it.
    (gfc_duplicate_allocatable, gfc_copy_allocatable_data): Adjust
    duplicate_allocatable callers.
    (gfc_duplicate_allocatable_nocopy): New function.
    (structure_alloc_comps): Adjust g*_full_array_size and
    duplicate_allocatable caller.
    * trans-array.h (gfc_full_array_size,
    gfc_duplicate_allocatable_nocopy): New prototypes.
    * trans-common.c (create_common): Call gfc_finish_decl_attrs.
    * trans-decl.c (gfc_finish_decl_attrs): New function.
    (gfc_finish_var_decl, create_function_arglist,
    gfc_get_fake_result_decl): Call it.
    (gfc_allocate_lang_decl): If DECL_LANG_SPECIFIC is already allocated,
    don't allocate it again.
    (gfc_get_symbol_decl): Set GFC_DECL_ASSOCIATE_VAR_P on
    associate-names.
    * trans.h (gfc_finish_decl_attrs): New prototype.
    (struct lang_decl): Add scalar_allocatable and scalar_pointer
    bitfields.
    (GFC_DECL_SCALAR_ALLOCATABLE, GFC_DECL_SCALAR_POINTER,
    GFC_DECL_GET_SCALAR_ALLOCATABLE, GFC_DECL_GET_SCALAR_POINTER,
    GFC_DECL_ASSOCIATE_VAR_P): Define.
    (GFC_POINTER_TYPE_P): Remove.
    * trans-openmp.c (gfc_omp_privatize_by_reference): Don't check
    GFC_POINTER_TYPE_P, instead test GFC_DECL_GET_SCALAR_ALLOCATABLE,
    GFC_DECL_GET_SCALAR_POINTER or GFC_DECL_CRAY_POINTEE on decl.
    (gfc_omp_predetermined_sharing): Associate-names are predetermined.
    (enum walk_alloc_comps): New.
    (gfc_has_alloc_comps, gfc_omp_unshare_expr_r, gfc_omp_unshare_expr,
    gfc_walk_alloc_comps): New functions.
    (gfc_omp_private_outer_ref): Return true for scalar allocatables or
    decls with allocatable components.
    (gfc_omp_clause_default_ctor, gfc_omp_clause_copy_ctor,
    gfc_omp_clause_assign_op, gfc_omp_clause_dtor): Fix up handling of
    allocatables, handle also OMP_CLAUSE_REDUCTION, handle scalar
    allocatables and decls with allocatable components.
    (gfc_trans_omp_array_reduction_or_udr): Don't handle allocatable
    arrays here.
    (gfc_trans_omp_reduction_list): Call
    gfc_trans_omp_array_reduction_or_udr even for allocatable scalars.
    (gfc_trans_omp_do_simd): If -fno-openmp, just expand it as OMP_SIMD.
    (gfc_trans_omp_parallel_do_simd): Likewise.
    * trans-types.c (gfc_sym_type): Don't set GFC_POINTER_TYPE_P.
    (gfc_get_derived_type): Call gfc_finish_decl_attrs.
gcc/testsuite/
    * gfortran.dg/gomp/allocatable_components_1.f90: Remove dg-error
    directives.
    * gfortran.dg/gomp/associate1.f90: New test.
    * gfortran.dg/gomp/intentin1.f90: New test.
    * gfortran.dg/gomp/openmp-simd-1.f90: New test.
    * gfortran.dg/gomp/openmp-simd-2.f90: New test.
    * gfortran.dg/gomp/openmp-simd-3.f90: New test.
    * gfortran.dg/gomp/proc_ptr_2.f90: New test.
libgomp/
    * testsuite/libgomp.fortran/allocatable9.f90: New test.
    * testsuite/libgomp.fortran/allocatable10.f90: New test.
    * testsuite/libgomp.fortran/allocatable11.f90: New test.
    * testsuite/libgomp.fortran/allocatable12.f90: New test.
    * testsuite/libgomp.fortran/alloc-comp-1.f90: New test.
    * testsuite/libgomp.fortran/alloc-comp-2.f90: New test.
    * testsuite/libgomp.fortran/alloc-comp-3.f90: New test.
    * testsuite/libgomp.fortran/associate1.f90: New test.
    * testsuite/libgomp.fortran/associate2.f90: New test.
    * testsuite/libgomp.fortran/procptr1.f90: New test.

Added:
    trunk/gcc/testsuite/gfortran.dg/gomp/associate1.f90
    trunk/gcc/testsuite/gfortran.dg/gomp/intentin1.f90
    trunk/gcc/testsuite/gfortran.dg/gomp/openmp-simd-1.f90
    trunk/gcc/testsuite/gfortran.dg/gomp/openmp-simd-2.f90
    trunk/gcc/testsuite/gfortran.dg/gomp/openmp-simd-3.f90
    trunk/gcc/testsuite/gfortran.dg/gomp/proc_ptr_2.f90
    trunk/libgomp/testsuite/libgomp.fortran/alloc-comp-1.f90
    trunk/libgomp/testsuite/libgomp.fortran/alloc-comp-2.f90
    trunk/libgomp/testsuite/libgomp.fortran/alloc-comp-3.f90
    trunk/libgomp/testsuite/libgomp.fortran/allocatable10.f90
    trunk/libgomp/testsuite/libgomp.fortran/allocatable11.f90
    trunk/libgomp/testsuite/libgomp.fortran/allocatable12.f90
    trunk/libgomp/testsuite/libgomp.fortran/allocatable9.f90
    trunk/libgomp/testsuite/libgomp.fortran/associate1.f90
    trunk/libgomp/testsuite/libgomp.fortran/associate2.f90
    trunk/libgomp/testsuite/libgomp.fortran/procptr1.f90
Modified:
    trunk/gcc/ChangeLog
    trunk/gcc/c-family/ChangeLog
    trunk/gcc/c-family/c-pragma.c
    trunk/gcc/fortran/ChangeLog
    trunk/gcc/fortran/f95-lang.c
    trunk/gcc/fortran/openmp.c
    trunk/gcc/fortran/parse.c
    trunk/gcc/fortran/scanner.c
    trunk/gcc/fortran/trans-array.c
    trunk/gcc/fortran/trans-array.h
    trunk/gcc/fortran/trans-common.c
    trunk/gcc/fortran/trans-decl.c
    trunk/gcc/fortran/trans-openmp.c
    trunk/gcc/fortran/trans-types.c
    trunk/gcc/fortran/trans.h
    trunk/gcc/omp-low.c
    trunk/gcc/testsuite/ChangeLog
    trunk/gcc/testsuite/gfortran.dg/gomp/allocatable_components_1.f90
    trunk/libgomp/ChangeLog

Reply via email to