From f564efa59103f101e08c4016c9f6d78967b4960c Mon Sep 17 00:00:00 2001 From: Nadav Rotem Date: Mon, 8 Jul 2013 23:31:13 +0000 Subject: [PATCH] This patch changes the saved IRBuilder insert point from BasicBlock::iterator to AssertingVH. Commit 185883 fixes a bug in the IRBuilder that should fix the ASan bot. AssertingVH can help in exposing some RAUW problems. Thanks Ben and Alexey! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@185886 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/Vectorize/SLPVectorizer.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/Transforms/Vectorize/SLPVectorizer.cpp b/lib/Transforms/Vectorize/SLPVectorizer.cpp index 136eaffb603..cfb5be77a4a 100644 --- a/lib/Transforms/Vectorize/SLPVectorizer.cpp +++ b/lib/Transforms/Vectorize/SLPVectorizer.cpp @@ -66,7 +66,7 @@ private: BuilderLocGuard(const BuilderLocGuard &); BuilderLocGuard &operator=(const BuilderLocGuard &); IRBuilder<> &Builder; - BasicBlock::iterator Loc; + AssertingVH Loc; }; /// A helper class for numbering instructions in multible blocks. @@ -1217,6 +1217,7 @@ Value *BoUpSLP::vectorizeTree(TreeEntry *E) { } void BoUpSLP::vectorizeTree() { + Builder.SetInsertPoint(&F->getEntryBlock()); vectorizeTree(&VectorizableTree[0]); // For each vectorized value: