Skip to content

[NO REVIEW] Adjust end version for GFortran c_funloc bug workaround #312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bonachea merged 1 commit into from
Apr 6, 2026
Merged

[NO REVIEW] Adjust end version for GFortran c_funloc bug workaround #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions include/language-support.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,21 @@
# endif
#endif

#ifndef NEED_C_FUNLOC_WORKAROUND
# if __GFORTRAN__ && HAVE_GCC_VERSION <= 150200
! Gfortran 13..15.2 bug workaround, believed to be fixed in 15.3 and 16.x:
! https://gcc.gnu.org/bugzilla/show_bug.cgi?id=124652
# define NEED_C_FUNLOC_WORKAROUND 1
# else
# define NEED_C_FUNLOC_WORKAROUND 0
# endif
#endif
#if NEED_C_FUNLOC_WORKAROUND
# define CAF_C_FUNLOC_PROCPTR(p) caf_c_funloc_deref(c_funloc(p))
#else
# define CAF_C_FUNLOC_PROCPTR(p) c_funloc(p)
#endif

! ISO_FORTRAN_ENV constant value control:
! The following knobs influence Caffeine's choice of value for the named constants
! specified by PRIF for ISO_FORTRAN_ENV:
Expand Down
3 changes: 2 additions & 1 deletion src/caffeine/caffeine.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,8 @@ void caf_atomic_logical(int opcode, int image, void* addr, int64_t *result, int6
}

//-------------------------------------------------------------------
// gfortran 13.2 .. 15 : c_funloc is non-compliant
// gfortran 13.2 .. 15.2 : c_funloc is non-compliant:
// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=124652
// it erroneously generates a non-callable pointer to a pointer to the subroutine
// This helper is used to undo that incorrect extra level of indirection
typedef void (*funloc_t)(void);
Expand Down
15 changes: 3 additions & 12 deletions src/caffeine/co_reduce_s.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
! Terms of use are as specified in LICENSE.txt

#include "assert_macros.h"
#include "language-support.F90"

submodule(prif:prif_private_s) co_reduce_s
! DO NOT ADD USE STATEMENTS HERE
Expand Down Expand Up @@ -37,12 +38,7 @@ subroutine contiguous_co_reduce(a, operation_wrapper, cdata, result_image, stat,
if (present(stat)) stat=0

call_assert(associated(operation_wrapper))
# if __GFORTRAN__
! Gfortran 13..15 bug workaround
funptr = caf_c_funloc_deref(c_funloc(operation_wrapper))
# else
funptr = c_funloc(operation_wrapper)
# endif
funptr = CAF_C_FUNLOC_PROCPTR(operation_wrapper)

call_assert(c_associated(funptr))

Expand Down Expand Up @@ -70,12 +66,7 @@ module subroutine prif_co_reduce_cptr(a_ptr, element_size, element_count, operat
if (present(stat)) stat=0

call_assert(associated(operation_wrapper))
# if __GFORTRAN__
! Gfortran 13..15 bug workaround
funptr = caf_c_funloc_deref(c_funloc(operation_wrapper))
# else
funptr = c_funloc(operation_wrapper)
# endif
funptr = CAF_C_FUNLOC_PROCPTR(operation_wrapper)
call_assert(c_associated(funptr))

call caf_co_reduce_cptr( &
Expand Down
Loading