Moved index into BB to common graph class because its needed by ModuloSchedGraph.

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

diff --git a/lib/CodeGen/InstrSched/SchedGraph.cpp b/lib/CodeGen/InstrSched/SchedGraph.cpp
index 86c9c4557b2db371308c0d1da3cc0994e032674d..9de0434364835a9050f9d2604505ecd50ad65b99 100644 (file)
--- a/lib/CodeGen/InstrSched/SchedGraph.cpp
+++ b/lib/CodeGen/InstrSched/SchedGraph.cpp
@@ -44,8 +44,7 @@ struct ValueToDefVecMap: public hash_map<const Value*, RefVec> {
 
 SchedGraphNode::SchedGraphNode(unsigned NID, MachineBasicBlock *mbb,
                                int   indexInBB, const TargetMachine& Target)
-  : SchedGraphNodeCommon(NID), origIndexInBB(indexInBB), MBB(mbb), 
-    MI(mbb ? (*mbb)[indexInBB] : 0) {
+  : SchedGraphNodeCommon(NID,indexInBB), MBB(mbb), MI(mbb ? (*mbb)[indexInBB] : 0) {
   if (MI) {
     MachineOpCode mopCode = MI->getOpCode();
     latency = Target.getInstrInfo().hasResultInterlock(mopCode)

diff --git a/lib/CodeGen/InstrSched/SchedGraph.h b/lib/CodeGen/InstrSched/SchedGraph.h
index 441aad179a74100044f1576ad7f13f2f175b87fb..4da761f0f85c8ff90b357c09190c0d85add382a8 100644 (file)
--- a/lib/CodeGen/InstrSched/SchedGraph.h
+++ b/lib/CodeGen/InstrSched/SchedGraph.h
@@ -26,7 +26,6 @@ class RefVec;
 
 class SchedGraphNode : public SchedGraphNodeCommon {
 
-  int origIndexInBB;            // original position of machine instr in BB
   MachineBasicBlock *MBB;
   const MachineInstr *MI;
 
@@ -46,7 +45,6 @@ public:
   bool isDummyNode() const { return (MI == NULL); }
   MachineBasicBlock &getMachineBasicBlock() const { return *MBB; }
 
-  int getOrigIndexInBB() const { return origIndexInBB; }
   void print(std::ostream &os) const;
 };
 

diff --git a/lib/Target/SparcV9/InstrSched/SchedGraph.cpp b/lib/Target/SparcV9/InstrSched/SchedGraph.cpp
index 86c9c4557b2db371308c0d1da3cc0994e032674d..9de0434364835a9050f9d2604505ecd50ad65b99 100644 (file)
--- a/lib/Target/SparcV9/InstrSched/SchedGraph.cpp
+++ b/lib/Target/SparcV9/InstrSched/SchedGraph.cpp
@@ -44,8 +44,7 @@ struct ValueToDefVecMap: public hash_map<const Value*, RefVec> {
 
 SchedGraphNode::SchedGraphNode(unsigned NID, MachineBasicBlock *mbb,
                                int   indexInBB, const TargetMachine& Target)
-  : SchedGraphNodeCommon(NID), origIndexInBB(indexInBB), MBB(mbb), 
-    MI(mbb ? (*mbb)[indexInBB] : 0) {
+  : SchedGraphNodeCommon(NID,indexInBB), MBB(mbb), MI(mbb ? (*mbb)[indexInBB] : 0) {
   if (MI) {
     MachineOpCode mopCode = MI->getOpCode();
     latency = Target.getInstrInfo().hasResultInterlock(mopCode)

diff --git a/lib/Target/SparcV9/InstrSched/SchedGraph.h b/lib/Target/SparcV9/InstrSched/SchedGraph.h
index 441aad179a74100044f1576ad7f13f2f175b87fb..4da761f0f85c8ff90b357c09190c0d85add382a8 100644 (file)
--- a/lib/Target/SparcV9/InstrSched/SchedGraph.h
+++ b/lib/Target/SparcV9/InstrSched/SchedGraph.h
@@ -26,7 +26,6 @@ class RefVec;
 
 class SchedGraphNode : public SchedGraphNodeCommon {
 
-  int origIndexInBB;            // original position of machine instr in BB
   MachineBasicBlock *MBB;
   const MachineInstr *MI;
 
@@ -46,7 +45,6 @@ public:
   bool isDummyNode() const { return (MI == NULL); }
   MachineBasicBlock &getMachineBasicBlock() const { return *MBB; }
 
-  int getOrigIndexInBB() const { return origIndexInBB; }
   void print(std::ostream &os) const;
 };