[llvm] r345021 - Leftover bits from https://reviews.llvm.org/D53420 that were accidentally left

[Dorit Nuzman via llvm-commits]

Author: dorit
Date: Tue Oct 23 04:51:55 2018
New Revision: 345021

URL: http://llvm.org/viewvc/llvm-project?rev=345021&view=rev
Log:
Leftover bits from https://reviews.llvm.org/D53420 that were accidentally left
out of revision 344883


Modified:
    llvm/trunk/include/llvm/Analysis/VectorUtils.h
    llvm/trunk/lib/Transforms/Vectorize/LoopVectorize.cpp

Modified: llvm/trunk/include/llvm/Analysis/VectorUtils.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/VectorUtils.h?rev=345021&r1=345020&r2=345021&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Analysis/VectorUtils.h (original)
+++ llvm/trunk/include/llvm/Analysis/VectorUtils.h Tue Oct 23 04:51:55 2018
@@ -310,9 +310,9 @@ public:
 
   /// Returns true if this Group requires a scalar iteration to handle gaps.
   bool requiresScalarEpilogue() const {
-    // If Group has no gaps, or has gaps but the last member exists, then a
-    // scalar epilog is not needed for this group.
-    if (getNumMembers() == getFactor() || getMember(getFactor() - 1))
+    // If the last member of the Group exists, then a scalar epilog is not
+    // needed for this group.
+    if (getMember(getFactor() - 1))
       return false;
 
     // We have a group with gaps. It therefore cannot be a group of stores,

Modified: llvm/trunk/lib/Transforms/Vectorize/LoopVectorize.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Vectorize/LoopVectorize.cpp?rev=345021&r1=345020&r2=345021&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Vectorize/LoopVectorize.cpp (original)
+++ llvm/trunk/lib/Transforms/Vectorize/LoopVectorize.cpp Tue Oct 23 04:51:55 2018
@@ -4600,8 +4600,7 @@ Optional<unsigned> LoopVectorizationCost
   }
 
   // Record that scalar epilogue is not allowed.
-  LLVM_DEBUG(dbgs() << "LV: Not inserting scalar epilogue for access with gaps "
-                       "due to -Os/-Oz.\n");
+  LLVM_DEBUG(dbgs() << "LV: Not allowing scalar epilogue due to -Os/-Oz.\n");
 
   // We don't create an epilogue when optimizing for size.
   // Invalidate interleave groups that require an epilogue.