SPIRV: Try to fix validation errors

Author: arsenm

llvm/lib/Target/SPIRV/SPIRVEmitIntrinsics.cpp

@@ -1108,7 +1108,7 @@ void SPIRVEmitIntrinsics::deduceOperandElementType(
   IRBuilder<> B(Ctx);
   for (auto &OpIt : Ops) {
     Value *Op = OpIt.first;
-    if (!Op->hasUseList() || Op->use_empty())
+    if (Op->use_empty())
       continue;
     if (AskOps && !AskOps->contains(Op))
       continue;
@@ -1124,7 +1124,8 @@ void SPIRVEmitIntrinsics::deduceOperandElementType(
       continue;
     Value *OpTyVal = getNormalizedPoisonValue(KnownElemTy);
     Type *OpTy = Op->getType();
-    if (!Ty || AskTy || isUntypedPointerTy(Ty) || isTodoType(Op)) {
+    if (Op->hasUseList() &&
+        (!Ty || AskTy || isUntypedPointerTy(Ty) || isTodoType(Op))) {
       Type *PrevElemTy = GR->findDeducedElementType(Op);
       GR->addDeducedElementType(Op, normalizeType(KnownElemTy));
       // check if KnownElemTy is complete
@@ -1637,9 +1638,6 @@ void SPIRVEmitIntrinsics::insertPtrCastOrAssignTypeInstr(Instruction *I,
     if (!isPointerTy(ArgOperand->getType()))
       continue;
 
-    if (!ArgOperand->hasUseList())
-      continue;
-
     // Constants (nulls/undefs) are handled in insertAssignPtrTypeIntrs()
     if (!isa<Instruction>(ArgOperand) && !isa<Argument>(ArgOperand)) {
       // However, we may have assumptions about the formal argument's type and