From 25c15cbb15b588e3087c1dc847bfd87c0d2dc32c Mon Sep 17 00:00:00 2001 From: foreman Date: Wed, 10 Apr 2019 16:00:39 -0400 Subject: [PATCH] P4 to Git Change 1768145 by kjayapra@4_HIPWS_SLV_SYM_COMGR on 2019/04/10 15:29:20 SWDEV-185753 - Fixing OCL Test Failure on CL1766106 Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.cpp#91 edit --- rocclr/runtime/device/pal/palprogram.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rocclr/runtime/device/pal/palprogram.cpp b/rocclr/runtime/device/pal/palprogram.cpp index ea2762c0ff..99abab1c62 100644 --- a/rocclr/runtime/device/pal/palprogram.cpp +++ b/rocclr/runtime/device/pal/palprogram.cpp @@ -33,7 +33,9 @@ namespace pal { Segment::Segment() : gpuAccess_(nullptr), cpuAccess_(nullptr), cpuMem_(nullptr) {} Segment::~Segment() { - delete gpuAccess_; + if (gpuAccess_ != nullptr) { + gpuAccess_->owner()->release(); + } DestroyCpuAccess(); } @@ -62,7 +64,7 @@ bool Segment::alloc(HSAILProgram& prog, amdgpu_hsa_elf_segment_t segment, size_t bool zero) { align = amd::alignUp(align, sizeof(uint32_t)); - amd::Memory *amd_mem_obj = new (prog.dev().context()) + amd::Memory* amd_mem_obj = new (prog.dev().context()) amd::Buffer(prog.dev().context(), 0, amd::alignUp(size, align), reinterpret_cast(1));