[PATCH 19/22] Coarray caf_shmem final patch set
Jerry D <[email protected]>
| Newsgroups | gmane.comp.gcc.patches,gmane.comp.gcc.fortran |
|---|---|
| Message-ID | <[email protected]> |
Ref: https://gcc.gnu.org/pipermail/fortran/2026-February/063551.html See attached. Awaiting approval.
caf_shmem-19-of-22.patch
(text/x-patch, 1.8 KB)
From 8e10c6477c095b074bd4e04ce41b86bc231dbc65 Mon Sep 17 00:00:00 2001 From: Jerry DeLisle <[email protected]> Date: Sun, 15 Feb 2026 15:30:39 -0800 Subject: [PATCH] Fortran: Fix run time failures when compiled with -m32 PR fortran/124080 libgfortran/ChangeLog: * caf/shmem/hashmap.c (hash): Use size_t instead of uint64. (hmiadd): Use size_t instead of ssize_t. (scan_inside_lookahead): Likewise. (scan_empty): Likewise. --- libgfortran/caf/shmem/hashmap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libgfortran/caf/shmem/hashmap.c b/libgfortran/caf/shmem/hashmap.c index e17d6dd2dca..1dd39801861 100644 --- a/libgfortran/caf/shmem/hashmap.c +++ b/libgfortran/caf/shmem/hashmap.c @@ -45,8 +45,8 @@ typedef struct /* 64 bit to 64 bit hash function. */ -static inline uint64_t -hash (uint64_t key) +static inline size_t +hash (size_t key) { key ^= (key >> 30); key *= 0xbf58476d1ce4e5b9ul; @@ -83,7 +83,7 @@ hmiadd (hashmap *hm, size_t s, ssize_t o) /* Get the expected offset for entry id. */ -static inline ssize_t +static inline size_t get_expected_offset (hashmap *hm, memid id) { return hash (id) >> (VOIDP_BITS - hm->s->bitnum); @@ -115,7 +115,7 @@ hashmap_init_supervisor (hashmap *hm, hashmap_shared *hs, allocator *a) the expected position and the maximum lookahead. */ static ssize_t -scan_inside_lookahead (hashmap *hm, ssize_t expected_off, memid id) +scan_inside_lookahead (hashmap *hm, size_t expected_off, memid id) { ssize_t lookahead; hashmap_entry *data; @@ -135,7 +135,7 @@ scan_inside_lookahead (hashmap *hm, ssize_t expected_off, memid id) to the expected position. */ static ssize_t -scan_empty (hashmap *hm, ssize_t expected_off) +scan_empty (hashmap *hm, size_t expected_off) { hashmap_entry *data; -- 2.53.0