Clean up usages of asserting vector getters in Type

[ctetreau]

Summary

Remove usages of asserting vector getters in Type in preparation for the
VectorType refactor. The existence of these functions complicates the
refactor while adding little value.

[ctetreau]

update to mention that this is NFC

[sdesmalen]

llvm/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp

2632–2633

If you change this to

if (auto *VTy = dyn_cast<VectorType>(I.getOperand(i)->getType()) {

you don't need the regular casts below.

[ctetreau]

address code review issues

[sdesmalen]

Thanks, LGTM!

llvm/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp

bool RewriteStatepointsForGC::runOnFunction(Function &F, DominatorTree &DT,
   // The right fix for this is to integrate GEPs into the base rewriting
   // algorithm properly, this is just a short term workaround to prevent
   // crashes by canonicalizing such GEPs into fully vector GEPs.
   for (Instruction &I : instructions(F)) {
     if (!isa<GetElementPtrInst>(I))
       continue;
 
     unsigned VF = 0;
     for (unsigned i = 0; i < I.getNumOperands(); i++)
-      if (I.getOperand(i)->getType()->isVectorTy()) {
-        assert(VF == 0 ||
-               VF == I.getOperand(i)->getType()->getVectorNumElements());
-        VF = I.getOperand(i)->getType()->getVectorNumElements();
+      if (auto *OpndVTy = dyn_cast<VectorType>(I.getOperand(i)->getType())) {
+        assert(VF == 0 || VF == OpndVTy->getNumElements());
+        VF = OpndVTy->getNumElements();
       }
 
     // It's the vector to scalar traversal through the pointer operand which
     // confuses base pointer rewriting, so limit ourselves to that case.
     if (!I.getOperand(0)->getType()->isVectorTy() && VF != 0) {
       IRBuilder<> B(&I);
       auto *Splat = B.CreateVectorSplat(VF, I.getOperand(0));
       I.setOperand(0, Splat);

llvm/lib/Transforms/Scalar/Scalarizer.cpp

 
 Scatterer::Scatterer(BasicBlock *bb, BasicBlock::iterator bbi, Value *v,
                      ValueVector *cachePtr)
   : BB(bb), BBI(bbi), V(v), CachePtr(cachePtr) {
   Type *Ty = V->getType();
   PtrTy = dyn_cast<PointerType>(Ty);
   if (PtrTy)
     Ty = PtrTy->getElementType();
-  Size = Ty->getVectorNumElements();
+  Size = cast<VectorType>(Ty)->getNumElements();
   if (!CachePtr)
     Tmp.resize(Size, nullptr);
   else if (CachePtr->empty())
     CachePtr->resize(Size, nullptr);
   else
     assert(Size == CachePtr->size() && "Inconsistent vector sizes");
 }
 
 // Return component I, creating a new Value for it if necessary.
 Value *Scatterer::operator[](unsigned I) {
   ValueVector &CV = (CachePtr ? *CachePtr : Tmp);
   // Try to reuse a previous value.
   if (CV[I])
     return CV[I];
   IRBuilder<> Builder(BB, BBI);
   if (PtrTy) {
-    Type *ElTy = PtrTy->getElementType()->getVectorElementType();
+    Type *ElTy = cast<VectorType>(PtrTy->getElementType())->getElementType();
     if (!CV[0]) {
       Type *NewPtrTy = PointerType::get(ElTy, PtrTy->getAddressSpace());
       CV[0] = Builder.CreateBitCast(V, NewPtrTy, V->getName() + ".i0");
     }
     if (I != 0)
       CV[I] = Builder.CreateConstGEP1_32(ElTy, CV[0], I,
                                          V->getName() + ".i" + Twine(I));
   } else {
bool ScalarizerVisitor::finish() {
   if (Gathered.empty() && Scattered.empty())
     return false;
   for (const auto &GMI : Gathered) {
     Instruction *Op = GMI.first;
     ValueVector &CV = *GMI.second;
     if (!Op->use_empty()) {
       // The value is still needed, so recreate it using a series of
       // InsertElements.
-      Type *Ty = Op->getType();
+      auto *Ty = cast<VectorType>(Op->getType());
       Value *Res = UndefValue::get(Ty);
       BasicBlock *BB = Op->getParent();
-      unsigned Count = Ty->getVectorNumElements();
+      unsigned Count = Ty->getNumElements();
       IRBuilder<> Builder(Op);
       if (isa<PHINode>(Op))
         Builder.SetInsertPoint(BB, BB->getFirstInsertionPt());
       for (unsigned I = 0; I < Count; ++I)
         Res = Builder.CreateInsertElement(Res, CV[I], Builder.getInt32(I),
                                           Op->getName() + ".upto" + Twine(I));
       Res->takeName(Op);
       Op->replaceAllUsesWith(Res);