diff --git a/llvm/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp b/llvm/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp --- a/llvm/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp +++ b/llvm/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp @@ -590,8 +590,7 @@ // Do not perform canonicalization if minmax pattern is found (to avoid // infinite loop). Type *Dummy; - if (!Ty->isIntegerTy() && Ty->isSized() && - !(Ty->isVectorTy() && cast(Ty)->isScalable()) && + if (!Ty->isIntegerTy() && Ty->isSized() && !isa(Ty) && DL.isLegalInteger(DL.getTypeStoreSizeInBits(Ty)) && DL.typeSizeEqualsStoreSize(Ty) && !DL.isNonIntegralPointerType(Ty) && !isMinMaxWithLoads( diff --git a/llvm/lib/Transforms/Instrumentation/PoisonChecking.cpp b/llvm/lib/Transforms/Instrumentation/PoisonChecking.cpp --- a/llvm/lib/Transforms/Instrumentation/PoisonChecking.cpp +++ b/llvm/lib/Transforms/Instrumentation/PoisonChecking.cpp @@ -195,8 +195,8 @@ break; case Instruction::ExtractElement: { Value *Vec = I.getOperand(0); - auto *VecVTy = cast(Vec->getType()); - if (VecVTy->isScalable()) + auto *VecVTy = dyn_cast(Vec->getType()); + if (!VecVTy) break; Value *Idx = I.getOperand(1); unsigned NumElts = VecVTy->getNumElements(); @@ -208,8 +208,8 @@ } case Instruction::InsertElement: { Value *Vec = I.getOperand(0); - auto *VecVTy = cast(Vec->getType()); - if (VecVTy->isScalable()) + auto *VecVTy = dyn_cast(Vec->getType()); + if (!VecVTy) break; Value *Idx = I.getOperand(2); unsigned NumElts = VecVTy->getNumElements(); diff --git a/llvm/lib/Transforms/Scalar/SROA.cpp b/llvm/lib/Transforms/Scalar/SROA.cpp --- a/llvm/lib/Transforms/Scalar/SROA.cpp +++ b/llvm/lib/Transforms/Scalar/SROA.cpp @@ -4482,8 +4482,7 @@ // Skip alloca forms that this analysis can't handle. auto *AT = AI.getAllocatedType(); - if (AI.isArrayAllocation() || !AT->isSized() || - (isa(AT) && cast(AT)->isScalable()) || + if (AI.isArrayAllocation() || !AT->isSized() || isa(AT) || DL.getTypeAllocSize(AT).getFixedSize() == 0) return false; @@ -4605,8 +4604,7 @@ for (BasicBlock::iterator I = EntryBB.begin(), E = std::prev(EntryBB.end()); I != E; ++I) { if (AllocaInst *AI = dyn_cast(I)) { - if (isa(AI->getAllocatedType()) && - cast(AI->getAllocatedType())->isScalable()) { + if (isa(AI->getAllocatedType())) { if (isAllocaPromotable(AI)) PromotableAllocas.push_back(AI); } else {