Align llvm-spirv with removing size from lifetime intrinsics

The proper fix will be done in Khronos.
The change is needed to fix the build after c23b4fb

Author: vmaksimo

llvm-spirv/lib/SPIRV/SPIRVReader.cpp

@@ -1876,43 +1876,19 @@ Value *SPIRVToLLVM::transValueWithoutDecoration(SPIRVValue *BV, Function *F,
   case OpLifetimeStart: {
     SPIRVLifetimeStart *LTStart = static_cast<SPIRVLifetimeStart *>(BV);
     IRBuilder<> Builder(BB);
-    SPIRVWord Size = LTStart->getSize();
-    ConstantInt *S = nullptr;
     auto *Var = transValue(LTStart->getObject(), F, BB);
-    Var = Var->stripPointerCasts();
-    if (Size)
-      S = Builder.getInt64(Size);
-    if (Size == 0) {
-      auto *Alloca = cast<AllocaInst>(Var);
-      if (Alloca->getAllocatedType()->isSized())
-        Size = M->getDataLayout().getTypeAllocSize(Alloca->getAllocatedType());
-      else
-        Size = static_cast<SPIRVWord>(-1);
-    }
-    CallInst *Start = Builder.CreateLifetimeStart(Var, S);
+    CallInst *Start = Builder.CreateLifetimeStart(Var);
     return mapValue(BV, Start);
   }
 
   case OpLifetimeStop: {
     SPIRVLifetimeStop *LTStop = static_cast<SPIRVLifetimeStop *>(BV);
     IRBuilder<> Builder(BB);
-    SPIRVWord Size = LTStop->getSize();
-    ConstantInt *S = nullptr;
     auto *Var = transValue(LTStop->getObject(), F, BB);
-    Var = Var->stripPointerCasts();
-    if (Size)
-      S = Builder.getInt64(Size);
-    if (Size == 0) {
-      auto *Alloca = cast<AllocaInst>(Var);
-      if (Alloca->getAllocatedType()->isSized())
-        Size = M->getDataLayout().getTypeAllocSize(Alloca->getAllocatedType());
-      else
-        Size = static_cast<SPIRVWord>(-1);
-    }
     for (const auto &I : Var->users())
       if (auto *II = getLifetimeStartIntrinsic(dyn_cast<Instruction>(I)))
-        return mapValue(BV, Builder.CreateLifetimeEnd(II->getOperand(1), S));
-    return mapValue(BV, Builder.CreateLifetimeEnd(Var, S));
+        return mapValue(BV, Builder.CreateLifetimeEnd(II->getOperand(1)));
+    return mapValue(BV, Builder.CreateLifetimeEnd(Var));
   }
 
   case OpStore: {

llvm-spirv/lib/SPIRV/SPIRVWriter.cpp

@@ -4841,14 +4841,11 @@ SPIRVValue *LLVMToSPIRVBase::transIntrinsicInst(IntrinsicInst *II,
     Op OC = (II->getIntrinsicID() == Intrinsic::lifetime_start)
                 ? OpLifetimeStart
                 : OpLifetimeStop;
-    int64_t Size = dyn_cast<ConstantInt>(II->getOperand(0))->getSExtValue();
-    if (Size == -1)
-      Size = 0;
-    Value *LLVMPtrOp = II->getOperand(1);
+    Value *LLVMPtrOp = II->getOperand(0);
     unsigned PtrAS = cast<PointerType>(LLVMPtrOp->getType())->getAddressSpace();
     auto *PtrOp = transValue(LLVMPtrOp, BB);
     if (PtrAS == SPIRAS_Private)
-      return BM->addLifetimeInst(OC, PtrOp, Size, BB);
+      return BM->addLifetimeInst(OC, PtrOp, 0, BB);
     // If pointer address space is Generic - use original allocation.
     BM->getErrorLog().checkError(
         PtrAS == SPIRAS_Generic, SPIRVEC_InvalidInstruction, II,
@@ -4857,7 +4854,7 @@ SPIRVValue *LLVMToSPIRVBase::transIntrinsicInst(IntrinsicInst *II,
       auto *UI = static_cast<SPIRVUnary *>(PtrOp);
       PtrOp = UI->getOperand(0);
     }
-    return BM->addLifetimeInst(OC, PtrOp, Size, BB);
+    return BM->addLifetimeInst(OC, PtrOp, 0, BB);
   }
   // We don't want to mix translation of regular code and debug info, because
   // it creates a mess, therefore translation of debug intrinsics is