From 3d72e50caebf232fdd7f70613616ca4fd4fb472b Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Tue, 3 Dec 2024 11:02:03 +0100 Subject: OpenMP: 'allocate' directive - fixes for 'alignof' and [[omp::decl]] Fixed a check to permit [[omp::decl(allocate,...)]] parsing in C. Additionaly, we discussed that 'allocate align' should not affect 'alignof' to avoid issues like with: int a; _Alignas(_Alignof(a)) int b; #pragma omp allocate(a) align(128) _Alignas(_Alignof(a)) int c; Thus, the alignment is no longer set in the C and Fortran front ends, but for static variables now in varpool_node::finalize_decl. (For stack variables, the alignment is handled in gimplify_bind_expr.) NOTE: 'omp allocate' is not yet supported in C++. gcc/c/ChangeLog: * c-parser.cc (c_parser_omp_allocate): Only check scope if not in_omp_decl_attribute. Remove setting the alignment. gcc/ChangeLog: * cgraphunit.cc (varpool_node::finalize_decl): Set alignment based on OpenMP's 'omp allocate' attribute/directive. gcc/fortran/ChangeLog: * trans-decl.cc (gfc_finish_var_decl): Remove setting the alignment. libgomp/ChangeLog: * libgomp.texi (Memory allocation): Mention (non-)effect of 'align' on _Alignof. * testsuite/libgomp.c/allocate-7.c: New test. gcc/testsuite/ChangeLog: * c-c++-common/gomp/allocate-18.c: Check that alignof is unaffected by 'omp allocate'. * c-c++-common/gomp/allocate-19.c: Likewise. --- gcc/fortran/trans-decl.cc | 3 --- 1 file changed, 3 deletions(-) (limited to 'gcc/fortran') diff --git a/gcc/fortran/trans-decl.cc b/gcc/fortran/trans-decl.cc index a62fe3f..d69c843 100644 --- a/gcc/fortran/trans-decl.cc +++ b/gcc/fortran/trans-decl.cc @@ -830,9 +830,6 @@ gfc_finish_var_decl (tree decl, gfc_symbol * sym) tree alloc = gfc_conv_constant_to_tree (n->u2.allocator); tree align = (n->u.align ? gfc_conv_constant_to_tree (n->u.align) : NULL_TREE); - if (align != NULL_TREE) - SET_DECL_ALIGN (decl, MAX (tree_to_uhwi (align), - DECL_ALIGN_UNIT (decl)) * BITS_PER_UNIT); DECL_ATTRIBUTES (decl) = tree_cons (get_identifier ("omp allocate"), build_tree_list (alloc, align), DECL_ATTRIBUTES (decl)); -- cgit v1.1