Check if value stored at BLOCK_INDEX_INVOKR_FUNC is NULL

FixAddressSpace for PHINode

Author: piotrkira

IGC/Compiler/CISACodeGen/ResolveGAS.cpp

@@ -1245,13 +1245,8 @@ void LowerGPCallArg::FixAddressSpaceInAllUses(Value* ptr, uint newAS, uint oldAS
             continue;
         }
 
-        if (BitCastInst* bitCastInst = dyn_cast<BitCastInst>(inst))
-        {
-            instType = dyn_cast<PointerType>(bitCastInst->getType());
-        }
-        else if (GetElementPtrInst* gepInst = dyn_cast<GetElementPtrInst>(inst))
-        {
-            instType = dyn_cast<PointerType>(gepInst->getType());
+        if (isa<BitCastInst>(inst) || isa<GetElementPtrInst>(inst) || isa<PHINode>(inst)) {
+            instType = dyn_cast<PointerType>(inst->getType());
         }
 
         if (instType && instType->getAddressSpace() == oldAS)

IGC/Compiler/Optimizer/OpenCLPasses/DeviceEnqueueFuncs/TransformBlocks.cpp

@@ -1570,7 +1570,7 @@ namespace //Anonymous
                                 {
                                     if (auto blockDescrStruct = StructValue::get(callInst->getArgOperand(blockArgIdx)->stripPointerCasts()))
                                     {
-                                        if (auto blockInvokeFunc = dyn_cast<llvm::Function>(blockDescrStruct->getValueStoredAtIndex(BLOCK_INDEX_INVOKE_FUNC)))
+                                        if (auto blockInvokeFunc = dyn_cast_or_null<llvm::Function>(blockDescrStruct->getValueStoredAtIndex(BLOCK_INDEX_INVOKE_FUNC)))
                                         {
                                             callInst->setCalledFunction(blockInvokeFunc);
                                             changed = true;