diff options
| author | Tobias Burnus <tobias@codesourcery.com> | 2023-02-03 11:31:53 +0100 |
|---|---|---|
| committer | Tobias Burnus <tobias@codesourcery.com> | 2023-02-03 11:31:53 +0100 |
| commit | 0b1ce70a813b98ef2893779d14ad6c90c5d06a71 (patch) | |
| tree | dd44ee568730e0a2c18152a7737b8a68b63e9a4b /libgomp/target.c | |
| parent | f84fdb134dec02f68fd9a39a58e726023470e537 (diff) | |
| download | gcc-0b1ce70a813b98ef2893779d14ad6c90c5d06a71.zip gcc-0b1ce70a813b98ef2893779d14ad6c90c5d06a71.tar.gz gcc-0b1ce70a813b98ef2893779d14ad6c90c5d06a71.tar.bz2 | |
libgomp: Fix reverse offload issues
If there is nothing to map, skip the mapping and avoid attempting to
copy 0 bytes from addrs, sizes and kinds.
Additionally, it could happen that a non-allocated address was deallocated,
such as a pointer set, leading to a free for the actual data.
libgomp/
* target.c (gomp_target_rev): Handle mapnum == 0 and avoid
freeing not allocated memory.
* testsuite/libgomp.fortran/reverse-offload-6.f90: New test.
Diffstat (limited to 'libgomp/target.c')
| -rw-r--r-- | libgomp/target.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libgomp/target.c b/libgomp/target.c index b16ee76..c1682ca 100644 --- a/libgomp/target.c +++ b/libgomp/target.c @@ -3324,7 +3324,7 @@ gomp_target_rev (uint64_t fn_ptr, uint64_t mapnum, uint64_t devaddrs_ptr, gomp_fatal ("Cannot find reverse-offload function"); void (*host_fn)() = (void (*)()) n->k->host_start; - if (devicep->capabilities & GOMP_OFFLOAD_CAP_SHARED_MEM) + if ((devicep->capabilities & GOMP_OFFLOAD_CAP_SHARED_MEM) || mapnum == 0) { devaddrs = (uint64_t *) (uintptr_t) devaddrs_ptr; sizes = (uint64_t *) (uintptr_t) sizes_ptr; @@ -3402,7 +3402,7 @@ gomp_target_rev (uint64_t fn_ptr, uint64_t mapnum, uint64_t devaddrs_ptr, } } - if (!(devicep->capabilities & GOMP_OFFLOAD_CAP_SHARED_MEM)) + if (!(devicep->capabilities & GOMP_OFFLOAD_CAP_SHARED_MEM) && mapnum > 0) { size_t j, struct_cpy = 0; splay_tree_key n2; @@ -3638,7 +3638,7 @@ gomp_target_rev (uint64_t fn_ptr, uint64_t mapnum, uint64_t devaddrs_ptr, host_fn (devaddrs); - if (!(devicep->capabilities & GOMP_OFFLOAD_CAP_SHARED_MEM)) + if (!(devicep->capabilities & GOMP_OFFLOAD_CAP_SHARED_MEM) && mapnum > 0) { uint64_t struct_cpy = 0; bool clean_struct = false; @@ -3680,7 +3680,7 @@ gomp_target_rev (uint64_t fn_ptr, uint64_t mapnum, uint64_t devaddrs_ptr, clean_struct = true; struct_cpy = sizes[i]; } - else if (cdata[i].aligned) + else if (!cdata[i].present && cdata[i].aligned) gomp_aligned_free ((void *) (uintptr_t) devaddrs[i]); else if (!cdata[i].present) free ((void *) (uintptr_t) devaddrs[i]); |