From 64f7d5b430b66dec138fe38373aa7e4a59d15570 Mon Sep 17 00:00:00 2001
From: "Arya.Rafii" <Arya.Rafii@amd.com>
Date: Wed, 17 Feb 2021 14:08:14 -0500
Subject: [PATCH] SWDEV-269246 - Fixed null-case logic for hipCtxPopCurrent

Change-Id: Ic173980caccde8afee85a75c55a5d536f421549e


[ROCm/clr commit: 5c2eb09624d25f6239b57efd664722f39d554aac]
---
 projects/clr/hipamd/rocclr/hip_context.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/projects/clr/hipamd/rocclr/hip_context.cpp b/projects/clr/hipamd/rocclr/hip_context.cpp
index 69fa7e7bbc..09443d1c61 100755
--- a/projects/clr/hipamd/rocclr/hip_context.cpp
+++ b/projects/clr/hipamd/rocclr/hip_context.cpp
@@ -214,12 +214,10 @@ hipError_t hipCtxPopCurrent(hipCtx_t* ctx) {
   HIP_INIT_API(hipCtxPopCurrent, ctx);
 
   hip::Device** dev = reinterpret_cast<hip::Device**>(ctx);
-  if (dev == nullptr) {
-    HIP_RETURN(hipErrorInvalidContext);
-  }
-
   if (!g_ctxtStack.empty()) {
-    *dev = g_ctxtStack.top();
+    if (dev != nullptr) {
+      *dev = g_ctxtStack.top();
+    }
     g_ctxtStack.pop();
   } else {
     DevLogError("Context Stack empty \n");