* Add #includes removed from headers

* ValueSet interface converted from add/remove to insert/erase
* Minor cleanups

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

diff --git a/lib/CodeGen/RegAlloc/InterferenceGraph.cpp b/lib/CodeGen/RegAlloc/InterferenceGraph.cpp
index 0de7275acf7c9e180e9f1371dc95fe1b636005aa..a366c117109b69ac7477fe40ab4ddb6492fc80b8 100644 (file)
--- a/lib/CodeGen/RegAlloc/InterferenceGraph.cpp
+++ b/lib/CodeGen/RegAlloc/InterferenceGraph.cpp
@@ -1,6 +1,7 @@
 #include "llvm/CodeGen/InterferenceGraph.h"
 #include "Support/STLExtras.h"
 #include <iostream>
+#include <algorithm>
 using std::cerr;
 
 //-----------------------------------------------------------------------------

diff --git a/lib/CodeGen/RegAlloc/LiveRangeInfo.cpp b/lib/CodeGen/RegAlloc/LiveRangeInfo.cpp
index b5f9275be4bf543db868cad5c1d7f81fc1ec6bb9..26e4788db7b266a798b1e3b1b36f6bf5523bb3a0 100644 (file)
--- a/lib/CodeGen/RegAlloc/LiveRangeInfo.cpp
+++ b/lib/CodeGen/RegAlloc/LiveRangeInfo.cpp
@@ -58,7 +58,7 @@ void LiveRangeInfo::unionAndUpdateLRs(LiveRange *const L1, LiveRange *L2)
 
     //assert(( L1->getTypeID() == L2->getTypeID()) && "Merge:Different types");
 
-    L1->add( *L2It );                   // add the var in L2 to L1
+    L1->insert(*L2It);                  // add the var in L2 to L1
     LiveRangeMap[ *L2It ] = L1;         // now the elements in L2 should map 
                                         //to L1    
   }
@@ -105,11 +105,9 @@ void LiveRangeInfo::constructLiveRanges()
              
   for( ; ArgIt != ArgList.end() ; ++ArgIt) {     // for each argument
     LiveRange * ArgRange = new LiveRange();      // creates a new LR and 
-    const Value *const Val = (const Value *) *ArgIt;
+    const Value *Val = (const Value *) *ArgIt;
 
-    assert( Val);
-
-    ArgRange->add(Val);     // add the arg (def) to it
+    ArgRange->insert(Val);     // add the arg (def) to it
     LiveRangeMap[Val] = ArgRange;
 
     // create a temp machine op to find the register class of value
@@ -173,8 +171,8 @@ void LiveRangeInfo::constructLiveRanges()
        }
 
        // create a new LR iff this operand is a def
-       if( OpI.isDef() ) {     
-         const Value *const Def = *OpI;
+       if (OpI.isDef()) {     
+         const Value *Def = *OpI;
 
          // Only instruction values are accepted for live ranges here
          if( Def->getValueType() != Value::InstructionVal ) {
@@ -188,10 +186,10 @@ void LiveRangeInfo::constructLiveRanges()
          // see LR already there (because of multiple defs)
          if( !DefRange) {                  // if it is not in LiveRangeMap
            DefRange = new LiveRange();     // creates a new live range and 
-           DefRange->add( Def );           // add the instruction (def) to it
+           DefRange->insert(Def);          // add the instruction (def) to it
            LiveRangeMap[ Def ] = DefRange; // update the map
 
-           if( DEBUG_RA > 1) {             
+           if (DEBUG_RA > 1) {             
              cerr << "  creating a LR for def: ";    
              printValue(Def); cerr  << "\n";
            }
@@ -215,7 +213,7 @@ void LiveRangeInfo::constructLiveRanges()
 
          }
          else {
-           DefRange->add( Def );           // add the opearand to def range
+           DefRange->insert(Def);          // add the opearand to def range
                                             // update the map - Operand points 
                                            // to the merged set
            LiveRangeMap[ Def ] = DefRange; 

diff --git a/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp b/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp
index 46f045c5e276222a45c2d81c9d1e1c4e70dbd056..422541c5845e565c7bfbc92d571b10847d7ee332 100644 (file)
--- a/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp
+++ b/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp
@@ -17,6 +17,7 @@
 #include "llvm/Analysis/LiveVar/MethodLiveVarInfo.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/MachineFrameInfo.h"
+#include "llvm/Method.h"
 #include <iostream>
 #include <math.h>
 using std::cerr;
@@ -423,7 +424,7 @@ void PhyRegAlloc::addInterferencesForArgs()
 
 
   for( ; ArgIt != ArgList.end() ; ++ArgIt) {  // for each argument
-    addInterference( *ArgIt, InSet, false );  // add interferences between 
+    addInterference((Value*)*ArgIt, InSet, false); // add interferences between 
                                               // args and LVars at start
     if( DEBUG_RA > 1) {
        cerr << " - %% adding interference for  argument ";    

diff --git a/lib/Target/SparcV9/RegAlloc/InterferenceGraph.cpp b/lib/Target/SparcV9/RegAlloc/InterferenceGraph.cpp
index 0de7275acf7c9e180e9f1371dc95fe1b636005aa..a366c117109b69ac7477fe40ab4ddb6492fc80b8 100644 (file)
--- a/lib/Target/SparcV9/RegAlloc/InterferenceGraph.cpp
+++ b/lib/Target/SparcV9/RegAlloc/InterferenceGraph.cpp
@@ -1,6 +1,7 @@
 #include "llvm/CodeGen/InterferenceGraph.h"
 #include "Support/STLExtras.h"
 #include <iostream>
+#include <algorithm>
 using std::cerr;
 
 //-----------------------------------------------------------------------------

diff --git a/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.cpp b/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.cpp
index b5f9275be4bf543db868cad5c1d7f81fc1ec6bb9..26e4788db7b266a798b1e3b1b36f6bf5523bb3a0 100644 (file)
--- a/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.cpp
+++ b/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.cpp
@@ -58,7 +58,7 @@ void LiveRangeInfo::unionAndUpdateLRs(LiveRange *const L1, LiveRange *L2)
 
     //assert(( L1->getTypeID() == L2->getTypeID()) && "Merge:Different types");
 
-    L1->add( *L2It );                   // add the var in L2 to L1
+    L1->insert(*L2It);                  // add the var in L2 to L1
     LiveRangeMap[ *L2It ] = L1;         // now the elements in L2 should map 
                                         //to L1    
   }
@@ -105,11 +105,9 @@ void LiveRangeInfo::constructLiveRanges()
              
   for( ; ArgIt != ArgList.end() ; ++ArgIt) {     // for each argument
     LiveRange * ArgRange = new LiveRange();      // creates a new LR and 
-    const Value *const Val = (const Value *) *ArgIt;
+    const Value *Val = (const Value *) *ArgIt;
 
-    assert( Val);
-
-    ArgRange->add(Val);     // add the arg (def) to it
+    ArgRange->insert(Val);     // add the arg (def) to it
     LiveRangeMap[Val] = ArgRange;
 
     // create a temp machine op to find the register class of value
@@ -173,8 +171,8 @@ void LiveRangeInfo::constructLiveRanges()
        }
 
        // create a new LR iff this operand is a def
-       if( OpI.isDef() ) {     
-         const Value *const Def = *OpI;
+       if (OpI.isDef()) {     
+         const Value *Def = *OpI;
 
          // Only instruction values are accepted for live ranges here
          if( Def->getValueType() != Value::InstructionVal ) {
@@ -188,10 +186,10 @@ void LiveRangeInfo::constructLiveRanges()
          // see LR already there (because of multiple defs)
          if( !DefRange) {                  // if it is not in LiveRangeMap
            DefRange = new LiveRange();     // creates a new live range and 
-           DefRange->add( Def );           // add the instruction (def) to it
+           DefRange->insert(Def);          // add the instruction (def) to it
            LiveRangeMap[ Def ] = DefRange; // update the map
 
-           if( DEBUG_RA > 1) {             
+           if (DEBUG_RA > 1) {             
              cerr << "  creating a LR for def: ";    
              printValue(Def); cerr  << "\n";
            }
@@ -215,7 +213,7 @@ void LiveRangeInfo::constructLiveRanges()
 
          }
          else {
-           DefRange->add( Def );           // add the opearand to def range
+           DefRange->insert(Def);          // add the opearand to def range
                                             // update the map - Operand points 
                                            // to the merged set
            LiveRangeMap[ Def ] = DefRange; 

diff --git a/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp b/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp
index 46f045c5e276222a45c2d81c9d1e1c4e70dbd056..422541c5845e565c7bfbc92d571b10847d7ee332 100644 (file)
--- a/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp
+++ b/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp
@@ -17,6 +17,7 @@
 #include "llvm/Analysis/LiveVar/MethodLiveVarInfo.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/MachineFrameInfo.h"
+#include "llvm/Method.h"
 #include <iostream>
 #include <math.h>
 using std::cerr;
@@ -423,7 +424,7 @@ void PhyRegAlloc::addInterferencesForArgs()
 
 
   for( ; ArgIt != ArgList.end() ; ++ArgIt) {  // for each argument
-    addInterference( *ArgIt, InSet, false );  // add interferences between 
+    addInterference((Value*)*ArgIt, InSet, false); // add interferences between 
                                               // args and LVars at start
     if( DEBUG_RA > 1) {
        cerr << " - %% adding interference for  argument ";