P4 to Git Change 2020678 by gandryey@gera-win10 on 2019/10/28 18:06:48

SWDEV-79445 - OCL generic changes and code clean-up
	- Fix memory leaks in COMGR path. Make sure  metadata_ object is properly destroyed in COMGR.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/devkernel.cpp#28 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devkernel.hpp#18 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#66 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.hpp#34 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.cpp#84 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rockernel.cpp#53 edit


[ROCm/clr commit: 720ea66859]

projects/clr/rocclr/runtime/device/devprogram.hpp

@@ -124,9 +124,9 @@ class Program : public amd::HeapObject {
 
 
 #if defined(USE_COMGR_LIBRARY)
-  amd_comgr_metadata_node_t* metadata_;   //!< COMgr metadata
+  amd_comgr_metadata_node_t metadata_;    //!< COMgr metadata
   uint32_t codeObjectVer_;                //!< version of code object
-  std::map<std::string,amd_comgr_metadata_node_t> kernelMetadataMap_; //!< Map of kernel metadata
+  std::map<std::string, amd_comgr_metadata_node_t> kernelMetadataMap_; //!< Map of kernel metadata
 #else
   CodeObjectMD* metadata_;  //!< Runtime metadata
 #endif
@@ -218,7 +218,7 @@ class Program : public amd::HeapObject {
   std::vector<amd::Memory*> getUndefMemObj() const { return undef_mem_obj_; }
 
 #if defined(USE_COMGR_LIBRARY)
-  const amd_comgr_metadata_node_t* metadata() const { return metadata_; }
+  amd_comgr_metadata_node_t metadata() const { return metadata_; }
 
   //! Get the kernel metadata
   const amd_comgr_metadata_node_t* getKernelMetadata(const std::string name) const {