From 55da404566ce18e13532661494d53819832684bd Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Sat, 11 Jan 2014 09:59:27 +0000 Subject: [PATCH] LoopVectorize.cpp: Appease MSC16. Excuse me, I hope msc16 builders would be fine till its end day. Introduce nullptr then. ;) git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@199001 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/Vectorize/LoopVectorize.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/Transforms/Vectorize/LoopVectorize.cpp b/lib/Transforms/Vectorize/LoopVectorize.cpp index 74285ec2457..6a4d8b411c2 100644 --- a/lib/Transforms/Vectorize/LoopVectorize.cpp +++ b/lib/Transforms/Vectorize/LoopVectorize.cpp @@ -1539,8 +1539,9 @@ static Instruction *getFirstInst(Instruction *FirstInst, Value *V, std::pair InnerLoopVectorizer::addStrideCheck(Instruction *Loc) { + Instruction *tnullptr = 0; if (!Legal->mustCheckStrides()) - return std::pair(0, 0); + return std::pair(tnullptr, tnullptr); IRBuilder<> ChkBuilder(Loc); @@ -1578,8 +1579,9 @@ InnerLoopVectorizer::addRuntimeCheck(Instruction *Loc) { LoopVectorizationLegality::RuntimePointerCheck *PtrRtCheck = Legal->getRuntimePointerCheck(); + Instruction *tnullptr = 0; if (!PtrRtCheck->Need) - return std::pair(0, 0); + return std::pair(tnullptr, tnullptr); unsigned NumPointers = PtrRtCheck->Pointers.size(); SmallVector , 2> Starts;