From 8bee1611b9b5fed0b61059cc56fc6d28f9f66b5e Mon Sep 17 00:00:00 2001 From: foreman Date: Tue, 15 Mar 2016 11:10:14 -0400 Subject: [PATCH] P4 to Git Change 1247486 by weizhang@weizhang-lnx-opencl on 2016/03/15 11:01:21 SWDEV-89454 - The memory pointed by m_nativeDisplayHandle should be freed at IOL. The memory pointed by m_nativeDisplayHandle is allocated in IOL, so it should be freed at IOL as well. Otherwise, the error of "double free or corruption" happens. Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp#162 edit [ROCm/clr commit: c33a49c7f6d6f3c3406669c2392183fc2751133f] --- .../runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp b/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp index 8d24f5124a..5b0797c967 100644 --- a/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp +++ b/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp @@ -56,16 +56,6 @@ CALGSLDevice::~CALGSLDevice() assert(m_adp == 0); /// CALBE client must call close explicitly. Check that here delete gslDeviceOps_; - - switch(m_deviceMode) - { - case GSL_DEVICE_MODE_NONE: - case GSL_DEVICE_MODE_CONSOLE: - delete static_cast(m_nativeDisplayHandle); - break; - case GSL_DEVICE_MODE_GFX: - break; - } }