X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FCodeGen%2FSpiller.h;h=f017583494ed28f2c621fdbbbdf180d5702c003b;hb=98d9648de7d571b2e6d139b65961a70d1833b0d7;hp=8abf9b517c874553efa0be4b7793fbb90a5391e0;hpb=38283e23df5aa748ec3bb5f02f14f1741cf491ce;p=oota-llvm.git

diff --git a/lib/CodeGen/Spiller.h b/lib/CodeGen/Spiller.h
index 8abf9b517c8..f017583494e 100644
--- a/lib/CodeGen/Spiller.h
+++ b/lib/CodeGen/Spiller.h
@@ -10,17 +10,14 @@
 #ifndef LLVM_CODEGEN_SPILLER_H
 #define LLVM_CODEGEN_SPILLER_H
 
-#include <vector>
-
 namespace llvm {
 
   class LiveInterval;
-  class LiveIntervals;
-  class LiveStacks;
   class MachineFunction;
-  class MachineInstr;
+  class MachineFunctionPass;
+  class SlotIndex;
+  template <typename T> class SmallVectorImpl;
   class VirtRegMap;
-  class VNInfo;
 
   /// Spiller interface.
   ///
@@ -30,15 +27,30 @@ namespace llvm {
   public:
     virtual ~Spiller() = 0;
 
-    /// Spill the given live range. The method used will depend on the Spiller
-    /// implementation selected.
-    virtual std::vector<LiveInterval*> spill(LiveInterval *li) = 0;
+    /// spill - Spill the given live interval. The method used will depend on
+    /// the Spiller implementation selected.
+    ///
+    /// @param li            The live interval to be spilled.
+    /// @param spillIs       A list of intervals that are about to be spilled,
+    ///                      and so cannot be used for remat etc.
+    /// @param newIntervals  The newly created intervals will be appended here.
+    virtual void spill(LiveInterval *li,
+                       SmallVectorImpl<LiveInterval*> &newIntervals,
+                       const SmallVectorImpl<LiveInterval*> &spillIs) = 0;
 
   };
 
   /// Create and return a spiller object, as specified on the command line.
-  Spiller* createSpiller(MachineFunction *mf, LiveIntervals *li,
-                         LiveStacks *ls, VirtRegMap *vrm);
+  Spiller* createSpiller(MachineFunctionPass &pass,
+                         MachineFunction &mf,
+                         VirtRegMap &vrm);
+
+  /// Create and return a spiller that will insert spill code directly instead
+  /// of deferring though VirtRegMap.
+  Spiller *createInlineSpiller(MachineFunctionPass &pass,
+                               MachineFunction &mf,
+                               VirtRegMap &vrm);
+
 }
 
 #endif