From 0e416df2b292e2b5c0dfe89ced8a610e852dd155 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Thu, 15 May 2003 18:03:51 +0000 Subject: Fix bug: Analysis/LoopInfo/2003-05-15-NestingProblem.ll llvm-svn: 6230 --- llvm/lib/Analysis/LoopInfo.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'llvm/lib/Analysis/LoopInfo.cpp') diff --git a/llvm/lib/Analysis/LoopInfo.cpp b/llvm/lib/Analysis/LoopInfo.cpp index 7a1daa089e2..251714cb002 100644 --- a/llvm/lib/Analysis/LoopInfo.cpp +++ b/llvm/lib/Analysis/LoopInfo.cpp @@ -122,6 +122,12 @@ void LoopInfo::print(std::ostream &OS) const { #endif } +static bool isNotAlreadyContainedIn(Loop *SubLoop, Loop *ParentLoop) { + if (SubLoop == 0) return true; + if (SubLoop == ParentLoop) return false; + return isNotAlreadyContainedIn(SubLoop->getParentLoop(), ParentLoop); +} + Loop *LoopInfo::ConsiderForLoop(BasicBlock *BB, const DominatorSet &DS) { if (BBMap.find(BB) != BBMap.end()) return 0; // Haven't processed this node? @@ -150,7 +156,7 @@ Loop *LoopInfo::ConsiderForLoop(BasicBlock *BB, const DominatorSet &DS) { // this child loop gets added to a part of the current loop, making it a // sibling to the current loop. We have to reparent this loop. if (Loop *SubLoop = const_cast(getLoopFor(X))) - if (SubLoop->getHeader() == X && X != BB) { + if (SubLoop->getHeader() == X && isNotAlreadyContainedIn(SubLoop, L)) { // Remove the subloop from it's current parent... assert(SubLoop->ParentLoop && SubLoop->ParentLoop != L); Loop *SLP = SubLoop->ParentLoop; // SubLoopParent -- cgit v1.2.3