Author: Cullen Rhodes Date: 2020-12-09T10:39:36Z New Revision: 4167a0259ec33a11530a6503e96acedaf3cb6a3d
URL: https://github.com/llvm/llvm-project/commit/4167a0259ec33a11530a6503e96acedaf3cb6a3d DIFF: https://github.com/llvm/llvm-project/commit/4167a0259ec33a11530a6503e96acedaf3cb6a3d.diff LOG: [IR] Support scalable vectors in CastInst::CreatePointerCast Reviewed By: sdesmalen Differential Revision: https://reviews.llvm.org/D92482 Added: Modified: llvm/lib/IR/Instructions.cpp llvm/unittests/IR/InstructionsTest.cpp Removed: ################################################################################ diff --git a/llvm/lib/IR/Instructions.cpp b/llvm/lib/IR/Instructions.cpp index 282746619d22..74a95da79932 100644 --- a/llvm/lib/IR/Instructions.cpp +++ b/llvm/lib/IR/Instructions.cpp @@ -3022,8 +3022,8 @@ CastInst *CastInst::CreatePointerCast(Value *S, Type *Ty, "Invalid cast"); assert(Ty->isVectorTy() == S->getType()->isVectorTy() && "Invalid cast"); assert((!Ty->isVectorTy() || - cast<FixedVectorType>(Ty)->getNumElements() == - cast<FixedVectorType>(S->getType())->getNumElements()) && + cast<VectorType>(Ty)->getElementCount() == + cast<VectorType>(S->getType())->getElementCount()) && "Invalid cast"); if (Ty->isIntOrIntVectorTy()) @@ -3041,8 +3041,8 @@ CastInst *CastInst::CreatePointerCast(Value *S, Type *Ty, "Invalid cast"); assert(Ty->isVectorTy() == S->getType()->isVectorTy() && "Invalid cast"); assert((!Ty->isVectorTy() || - cast<FixedVectorType>(Ty)->getNumElements() == - cast<FixedVectorType>(S->getType())->getNumElements()) && + cast<VectorType>(Ty)->getElementCount() == + cast<VectorType>(S->getType())->getElementCount()) && "Invalid cast"); if (Ty->isIntOrIntVectorTy()) diff --git a/llvm/unittests/IR/InstructionsTest.cpp b/llvm/unittests/IR/InstructionsTest.cpp index 7a4dad21ecc9..419cddc0c370 100644 --- a/llvm/unittests/IR/InstructionsTest.cpp +++ b/llvm/unittests/IR/InstructionsTest.cpp @@ -368,11 +368,19 @@ TEST(InstructionsTest, CastInst) { Constant *NullV2I32Ptr = Constant::getNullValue(V2Int32PtrTy); auto Inst1 = CastInst::CreatePointerCast(NullV2I32Ptr, V2Int32Ty, "foo", BB); + Constant *NullVScaleV2I32Ptr = Constant::getNullValue(VScaleV2Int32PtrTy); + auto Inst1VScale = CastInst::CreatePointerCast( + NullVScaleV2I32Ptr, VScaleV2Int32Ty, "foo.vscale", BB); + // Second form auto Inst2 = CastInst::CreatePointerCast(NullV2I32Ptr, V2Int32Ty); + auto Inst2VScale = + CastInst::CreatePointerCast(NullVScaleV2I32Ptr, VScaleV2Int32Ty); delete Inst2; + delete Inst2VScale; Inst1->eraseFromParent(); + Inst1VScale->eraseFromParent(); delete BB; } _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits