Remove dependence on BBLiveVar from InstrScheduling

Minor cleanups

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@1688 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/InstrSched/InstrScheduling.cpp b/lib/CodeGen/InstrSched/InstrScheduling.cpp
index 292c2c55e1cf357944584f2bdc17e7ed464947a8..09d0e40d80fa41387370a51142986d44d4e85c09 100644 (file)
--- a/lib/CodeGen/InstrSched/InstrScheduling.cpp
+++ b/lib/CodeGen/InstrSched/InstrScheduling.cpp
@@ -11,12 +11,11 @@
 
 
 #include "llvm/CodeGen/InstrScheduling.h"
-#include "llvm/Analysis/LiveVar/BBLiveVar.h"
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/CodeGen/MachineCodeForInstruction.h"
 #include "llvm/CodeGen/MachineCodeForMethod.h"
 #include "llvm/Target/TargetMachine.h"
-#include "Support/CommandLine.h"
+#include "llvm/BasicBlock.h"
 #include "SchedPriorities.h"
 #include <ext/hash_set>
 #include <algorithm>

diff --git a/lib/CodeGen/InstrSched/SchedPriorities.h b/lib/CodeGen/InstrSched/SchedPriorities.h
index 78b685daddec8eb09983d0023906ee9f2468f80f..884a049b94a4716e6f6784553b96517bdb90f49f 100644 (file)
--- a/lib/CodeGen/InstrSched/SchedPriorities.h
+++ b/lib/CodeGen/InstrSched/SchedPriorities.h
@@ -27,7 +27,7 @@
 #include "llvm/Target/MachineSchedInfo.h"
 #include "Support/CommandLine.h"
 #include <list>
-
+#include <hash_set>
 class Method;
 class MachineInstr;
 class SchedulingManager;
@@ -76,10 +76,9 @@ public:
   typedef std::list<NodeDelayPair*>::const_iterator const_iterator;
   
 public:
-  /*ctor*/       NodeHeap      () : std::list<NodeDelayPair*>(), _size(0) {}
-  /*dtor*/       ~NodeHeap     () {}
+  NodeHeap() : _size(0) {}
   
-  inline unsigned int  size    () const { return _size; }
+  inline unsigned       size() const { return _size; }
   
   const SchedGraphNode* getNode        (const_iterator i) const { return (*i)->node; }
   cycles_t             getDelay(const_iterator i) const { return (*i)->delay;}

diff --git a/lib/Target/SparcV9/InstrSched/InstrScheduling.cpp b/lib/Target/SparcV9/InstrSched/InstrScheduling.cpp
index 292c2c55e1cf357944584f2bdc17e7ed464947a8..09d0e40d80fa41387370a51142986d44d4e85c09 100644 (file)
--- a/lib/Target/SparcV9/InstrSched/InstrScheduling.cpp
+++ b/lib/Target/SparcV9/InstrSched/InstrScheduling.cpp
@@ -11,12 +11,11 @@
 
 
 #include "llvm/CodeGen/InstrScheduling.h"
-#include "llvm/Analysis/LiveVar/BBLiveVar.h"
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/CodeGen/MachineCodeForInstruction.h"
 #include "llvm/CodeGen/MachineCodeForMethod.h"
 #include "llvm/Target/TargetMachine.h"
-#include "Support/CommandLine.h"
+#include "llvm/BasicBlock.h"
 #include "SchedPriorities.h"
 #include <ext/hash_set>
 #include <algorithm>

diff --git a/lib/Target/SparcV9/InstrSched/SchedPriorities.h b/lib/Target/SparcV9/InstrSched/SchedPriorities.h
index 78b685daddec8eb09983d0023906ee9f2468f80f..884a049b94a4716e6f6784553b96517bdb90f49f 100644 (file)
--- a/lib/Target/SparcV9/InstrSched/SchedPriorities.h
+++ b/lib/Target/SparcV9/InstrSched/SchedPriorities.h
@@ -27,7 +27,7 @@
 #include "llvm/Target/MachineSchedInfo.h"
 #include "Support/CommandLine.h"
 #include <list>
-
+#include <hash_set>
 class Method;
 class MachineInstr;
 class SchedulingManager;
@@ -76,10 +76,9 @@ public:
   typedef std::list<NodeDelayPair*>::const_iterator const_iterator;
   
 public:
-  /*ctor*/       NodeHeap      () : std::list<NodeDelayPair*>(), _size(0) {}
-  /*dtor*/       ~NodeHeap     () {}
+  NodeHeap() : _size(0) {}
   
-  inline unsigned int  size    () const { return _size; }
+  inline unsigned       size() const { return _size; }
   
   const SchedGraphNode* getNode        (const_iterator i) const { return (*i)->node; }
   cycles_t             getDelay(const_iterator i) const { return (*i)->delay;}