Start using the nicer terminator auto-insertion API
llvm-svn: 10111
diff --git a/llvm/lib/Transforms/Instrumentation/ProfilePaths/CombineBranch.cpp b/llvm/lib/Transforms/Instrumentation/ProfilePaths/CombineBranch.cpp
index 0420782..b178b5d 100644
--- a/llvm/lib/Transforms/Instrumentation/ProfilePaths/CombineBranch.cpp
+++ b/llvm/lib/Transforms/Instrumentation/ProfilePaths/CombineBranch.cpp
@@ -122,9 +122,7 @@
sameTarget.push_back(MI->first);
BasicBlock *newBB = new BasicBlock("newCommon", MI->first->getParent());
- BranchInst *newBranch = new BranchInst(MI->second);
-
- newBB->getInstList().push_back(newBranch);
+ BranchInst *newBranch = new BranchInst(MI->second, 0, 0, newBB);
std::map<PHINode *, std::vector<unsigned int> > phiMap;
diff --git a/llvm/lib/Transforms/Instrumentation/ProfilePaths/EdgeCode.cpp b/llvm/lib/Transforms/Instrumentation/ProfilePaths/EdgeCode.cpp
index 3cb5698..51bc425 100644
--- a/llvm/lib/Transforms/Instrumentation/ProfilePaths/EdgeCode.cpp
+++ b/llvm/lib/Transforms/Instrumentation/ProfilePaths/EdgeCode.cpp
@@ -344,12 +344,10 @@
newBB->getInstList().push_back(newBI2);
//triggerBB->getInstList().push_back(triggerInst);
- Instruction *triggerBranch = new BranchInst(BB2);
- triggerBB->getInstList().push_back(triggerBranch);
+ new BranchInst(BB2, 0, 0, triggerBB);
}
else{
- Instruction *newBI2=new BranchInst(BB2);
- newBB->getInstList().push_back(newBI2);
+ new BranchInst(BB2, 0, 0, newBB);
}
//now iterate over BB2, and set its Phi nodes right
diff --git a/llvm/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp b/llvm/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp
index 9d6107c..8331781 100644
--- a/llvm/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp
+++ b/llvm/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp
@@ -145,10 +145,8 @@
ti->setSuccessor(index, newBB);
BasicBlock::InstListType < = newBB->getInstList();
-
- Instruction *call = new CallInst(inCountMth);
- lt.push_back(call);
- lt.push_back(new BranchInst(BB));
+ lt.push_back(new CallInst(inCountMth));
+ new BranchInst(BB, newBB);
//now iterate over *vl, and set its Phi nodes right
for(BasicBlock::iterator BB2Inst = BB->begin(), BBend = BB->end();