BB-Vectorizer: Check the cost of the store pointer type

and not the return type, which is void. A number of test
cases fail after adding the assertion in TTImpl.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@170828 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/TargetTransformImpl.cpp b/lib/Target/TargetTransformImpl.cpp
index 7f9fdfc..4320437 100644 (file)
--- a/lib/Target/TargetTransformImpl.cpp
+++ b/lib/Target/TargetTransformImpl.cpp
@@ -340,6 +340,7 @@ unsigned
 VectorTargetTransformImpl::getMemoryOpCost(unsigned Opcode, Type *Src,
                                            unsigned Alignment,
                                            unsigned AddressSpace) const {
+  assert(!Src->isVoidTy() && "Invalid type");
   std::pair<unsigned, MVT> LT = getTypeLegalizationCost(Src);
 
   // Assume that all loads of legal types cost 1.

diff --git a/lib/Transforms/Vectorize/BBVectorize.cpp b/lib/Transforms/Vectorize/BBVectorize.cpp
index a482291..ee3202a 100644 (file)
--- a/lib/Transforms/Vectorize/BBVectorize.cpp
+++ b/lib/Transforms/Vectorize/BBVectorize.cpp
@@ -968,9 +968,9 @@ namespace {
         }
 
         if (VTTI) {
-          unsigned ICost = VTTI->getMemoryOpCost(I->getOpcode(), I->getType(),
+          unsigned ICost = VTTI->getMemoryOpCost(I->getOpcode(), aTypeI,
                                                  IAlignment, IAddressSpace);
-          unsigned JCost = VTTI->getMemoryOpCost(J->getOpcode(), J->getType(),
+          unsigned JCost = VTTI->getMemoryOpCost(J->getOpcode(), aTypeJ,
                                                  JAlignment, JAddressSpace);
           unsigned VCost = VTTI->getMemoryOpCost(I->getOpcode(), VType,
                                                  BottomAlignment,