From 438b583dbd20f63b70d0b5abb7780a50bf03dd83 Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Sat, 31 Oct 2009 17:33:01 +0000 Subject: Revert r85667. LoopUnroll currently can't call utility functions which auto-update the DominatorTree because it doesn't keep the DominatorTree current while it works. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@85670 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Transforms/Utils/BasicBlockUtils.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'include/llvm/Transforms/Utils/BasicBlockUtils.h') diff --git a/include/llvm/Transforms/Utils/BasicBlockUtils.h b/include/llvm/Transforms/Utils/BasicBlockUtils.h index 47d6895..e766d72 100644 --- a/include/llvm/Transforms/Utils/BasicBlockUtils.h +++ b/include/llvm/Transforms/Utils/BasicBlockUtils.h @@ -43,11 +43,9 @@ void FoldSingleEntryPHINodes(BasicBlock *BB); /// it is ultimately unused or if it reaches an unused cycle. void DeleteDeadPHIs(BasicBlock *BB); -/// MergeBlockIntoPredecessor - Folds a basic block into its predecessor if it -/// only has one predecessor, and that predecessor only has one successor. -/// If a Pass is given, the LoopInfo and DominatorTree analyses will be kept -/// current. Returns the combined block, or null if no merging was performed. -BasicBlock *MergeBlockIntoPredecessor(BasicBlock* BB, Pass* P = 0); +/// MergeBlockIntoPredecessor - Attempts to merge a block into its predecessor, +/// if possible. The return value indicates success or failure. +bool MergeBlockIntoPredecessor(BasicBlock* BB, Pass* P = 0); // ReplaceInstWithValue - Replace all uses of an instruction (specified by BI) // with a value, then remove and delete the original instruction. -- cgit v1.1