#include "llvm/Transforms/Scalar.h"
#include "llvm/Pass.h"
#include "llvm/Function.h"
-#include "llvm/iTerminators.h"
-#include "llvm/iPHINode.h"
-#include "llvm/iOperators.h"
+#include "llvm/Instructions.h"
#include "llvm/ConstantHandling.h"
-#include "llvm/Assembly/Writer.h"
#include "llvm/Analysis/Dominators.h"
+#include "llvm/Assembly/Writer.h"
#include "llvm/Transforms/Utils/Local.h"
+#include "llvm/Transforms/Utils/BasicBlockUtils.h"
#include "llvm/Support/ConstantRange.h"
#include "llvm/Support/CFG.h"
#include "Support/Debug.h"
// If we just introduced a critical edge in the flow graph, make sure to break
// it right away...
- if (isCriticalEdge(TI, SuccNo))
- SplitCriticalEdge(TI, SuccNo, this);
+ SplitCriticalEdge(TI, SuccNo, this);
// Make sure that we don't introduce critical edges from oldsucc now!
for (unsigned i = 0, e = OldSucc->getTerminator()->getNumSuccessors();
//===----------------------------------------------------------------------===//
#include "llvm/Transforms/Scalar.h"
+#include "llvm/Transforms/Utils/BasicBlockUtils.h"
#include "llvm/Analysis/Dominators.h"
#include "llvm/Function.h"
#include "llvm/iTerminators.h"
return I != E;
}
-// SplitCriticalEdge - Insert a new node node to split the critical edge. This
-// will update DominatorSet, ImmediateDominator and DominatorTree information if
-// it is available, thus calling this pass will not invalidate either of them.
+// SplitCriticalEdge - If this edge is a critical edge, insert a new node to
+// split the critical edge. This will update DominatorSet, ImmediateDominator,
+// DominatorTree, and DominatorFrontier information if it is available, thus
+// calling this pass will not invalidate either of them. This returns true if
+// the edge was split, false otherwise.
//
-void SplitCriticalEdge(TerminatorInst *TI, unsigned SuccNum, Pass *P) {
- assert(isCriticalEdge(TI, SuccNum) &&
- "Cannot break a critical edge, if it isn't a critical edge");
+bool SplitCriticalEdge(TerminatorInst *TI, unsigned SuccNum, Pass *P) {
+ if (!isCriticalEdge(TI, SuccNum)) return false;
BasicBlock *TIBB = TI->getParent();
BasicBlock *DestBB = TI->getSuccessor(SuccNum);
}
// If we don't have a pass object, we can't update anything...
- if (P == 0) return;
+ if (P == 0) return true;
// Now update analysis information. These are the analyses that we are
// currently capable of updating...
NewDFSet.insert(DestBB);
DF->addBasicBlock(NewBB, NewDFSet);
}
+ return true;
}
// runOnFunction - Loop over all of the edges in the CFG, breaking critical
TerminatorInst *TI = I->getTerminator();
if (TI->getNumSuccessors() > 1)
for (unsigned i = 0, e = TI->getNumSuccessors(); i != e; ++i)
- if (isCriticalEdge(TI, i)) {
- SplitCriticalEdge(TI, i, this);
+ if (SplitCriticalEdge(TI, i, this)) {
++NumBroken;
Changed = true;
}