wrap null to a constant tracker intrinsic

Author: VyacheslavLevytskyy

llvm/lib/Target/SPIRV/SPIRVEmitIntrinsics.cpp

@@ -2070,12 +2070,11 @@ void SPIRVEmitIntrinsics::processInstrAfterVisit(Instruction *I,
     if (OpTy->isTargetExtTy())
       OpTyVal = getNormalizedPoisonValue(OpTy);
     Value *NewOp = Op;
-    if (OpTy->isTargetExtTy())
+    if (OpTy->isTargetExtTy() || isa<ConstantPointerNull>(Op))
       NewOp = buildIntrWithMD(Intrinsic::spv_track_constant,
                               {OpTy, OpTyVal->getType()}, Op, OpTyVal, {}, B);
-    Type *OpElemTy = nullptr;
-    if (!IsConstComposite && isPointerTy(OpTy) &&
-        (OpElemTy = GR->findDeducedElementType(Op)) != nullptr &&
+    Type *OpElemTy = GR->findDeducedElementType(Op);
+    if (!IsConstComposite && isPointerTy(OpTy) && OpElemTy != nullptr &&
         OpElemTy != IntegerType::getInt8Ty(I->getContext())) {
       GR->buildAssignPtr(B, IntegerType::getInt8Ty(I->getContext()), NewOp);
       SmallVector<Type *, 2> Types = {OpTy, OpTy};

llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.cpp

@@ -616,8 +616,10 @@ SPIRVGlobalRegistry::getOrCreateConstNullPtr(MachineIRBuilder &MIRBuilder,
                                              SPIRVType *SpvType) {
   const Type *Ty = getTypeForSPIRVType(SpvType);
   unsigned AddressSpace = typeToAddressSpace(Ty);
-  const Constant *CP = ConstantPointerNull::get(
-      PointerType::get(Ty->getContext(), AddressSpace));
+  Type *ElemTy = ::getPointeeType(Ty);
+  assert(ElemTy);
+  const Constant *CP = ConstantTargetNone::get(
+      dyn_cast<TargetExtType>(getTypedPointerWrapper(ElemTy, AddressSpace)));
   Register Res = find(CP, CurMF);
   if (Res.isValid())
     return Res;