From 748429b9ba8a3ae6d3e24f95014a392eef0ac714 Mon Sep 17 00:00:00 2001
From: foreman <dl.swbuild@amd.com>
Date: Thu, 11 Apr 2019 11:13:22 -0400
Subject: [PATCH] P4 to Git Change 1768486 by wchau@wc_hip_vdi on 2019/04/11
 10:57:40

	SWDEV-165259 - Update OpenCL runtime to support MsgPack metadata
	- Fixed issue to support V2 kernel objects

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#41 edit
---
 rocclr/runtime/device/devprogram.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rocclr/runtime/device/devprogram.cpp b/rocclr/runtime/device/devprogram.cpp
index 47a6662e22..a28cfb1bb3 100644
--- a/rocclr/runtime/device/devprogram.cpp
+++ b/rocclr/runtime/device/devprogram.cpp
@@ -2887,10 +2887,13 @@ bool Program::createKernelMetadataMap() {
       LogInfo("Using Code Object V3.");
       hasKernelMD = true;
       codeObjectVer_ = 3;
-      status = amd::Comgr::get_metadata_list_size(kernelsMD, &size);
     }
   }
 
+  if (status == AMD_COMGR_STATUS_SUCCESS) {
+    status = amd::Comgr::get_metadata_list_size(kernelsMD, &size);
+  }
+
   for (size_t i = 0; i < size && status == AMD_COMGR_STATUS_SUCCESS; i++) {
     amd_comgr_metadata_node_t nameMeta;
     bool hasNameMeta = false;