Fix a bug in non-local memdep that was causing an infinite loop on 175.vpr.

[oota-llvm.git] / lib / Analysis / Interval.cpp

diff --git a/lib/Analysis/Interval.cpp b/lib/Analysis/Interval.cpp
index 97fa34ea7aeb0a0c9069caa423aedda98f4f2676..404d2c2f4a88c423c316c79ad190f169c976314f 100644 (file)
--- a/lib/Analysis/Interval.cpp
+++ b/lib/Analysis/Interval.cpp
@@ -1,14 +1,23 @@
-//===- Interval.cpp - Interval class code ------------------------*- C++ -*--=//
+//===- Interval.cpp - Interval class code ---------------------------------===//
 //
-// This file contains the definition of the cfg::Interval class, which
-// represents a partition of a control flow graph of some kind.
+//                     The LLVM Compiler Infrastructure
+//
+// This file was developed by the LLVM research group and is distributed under
+// the University of Illinois Open Source License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file contains the definition of the Interval class, which represents a
+// partition of a control flow graph of some kind.
 //
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Analysis/Interval.h"
 #include "llvm/BasicBlock.h"
+#include "llvm/Support/CFG.h"
+#include <algorithm>
 
-using namespace cfg;
+using namespace llvm;
 
 //===----------------------------------------------------------------------===//
 // Interval Implementation
@@ -19,11 +28,30 @@ using namespace cfg;
 bool Interval::isLoop() const {
   // There is a loop in this interval iff one of the predecessors of the header
   // node lives in the interval.
-  for (BasicBlock::pred_iterator I = pred_begin(HeaderNode), 
-                                 E = pred_end(HeaderNode); I != E; ++I) {
+  for (::pred_iterator I = ::pred_begin(HeaderNode), E = ::pred_end(HeaderNode);
+       I != E; ++I) {
     if (contains(*I)) return true;
   }
   return false;
 }
 
 
+void Interval::print(std::ostream &o) const {
+  o << "-------------------------------------------------------------\n"
+       << "Interval Contents:\n";
+
+  // Print out all of the basic blocks in the interval...
+  for (std::vector<BasicBlock*>::const_iterator I = Nodes.begin(),
+         E = Nodes.end(); I != E; ++I)
+    o << **I << "\n";
+
+  o << "Interval Predecessors:\n";
+  for (std::vector<BasicBlock*>::const_iterator I = Predecessors.begin(),
+         E = Predecessors.end(); I != E; ++I)
+    o << **I << "\n";
+
+  o << "Interval Successors:\n";
+  for (std::vector<BasicBlock*>::const_iterator I = Successors.begin(),
+         E = Successors.end(); I != E; ++I)
+    o << **I << "\n";
+}