From: Julian Brown Date: Tue, 10 Sep 2019 15:33:48 +0000 (-0700) Subject: [og9] Fix src_copy mismerge in GOMP_OFFLOAD_openacc_async_host2dev X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d244bdcbcf9dfc638e1b5a65446cec79ae172519;p=thirdparty%2Fgcc.git [og9] Fix src_copy mismerge in GOMP_OFFLOAD_openacc_async_host2dev libgomp/ * plugin/plugin-gcn.c (GOMP_OFFLOAD_openacc_async_host2dev): Enqueue copy from src_copy not src. (cherry picked from openacc-gcc-9-branch commit 182c52fc5b247a2bb08a83d27edf269ef668e7dd) --- diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp index 59605cd85bf5..a15d4a0ed490 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,3 +1,8 @@ +2019-09-10 Julian Brown + + * plugin/plugin-gcn.c (GOMP_OFFLOAD_openacc_async_host2dev): Enqueue + copy from src_copy not src. + 2019-09-10 Kwok Cheung Yeung * config/gcn/team.c (gomp_gcn_exit_kernel): Free GCN thread list. diff --git a/libgomp/plugin/plugin-gcn.c b/libgomp/plugin/plugin-gcn.c index 9d03e4f9f5b4..2b17204cd807 100644 --- a/libgomp/plugin/plugin-gcn.c +++ b/libgomp/plugin/plugin-gcn.c @@ -3613,7 +3613,7 @@ GOMP_OFFLOAD_openacc_async_host2dev (int device, void *dst, const void *src, But, that is probably correct. */ void *src_copy = GOMP_PLUGIN_malloc (n); memcpy (src_copy, src, n); - queue_push_copy (aq, dst, src, n, true); + queue_push_copy (aq, dst, src_copy, n, true); return true; }