[llvm-commits] CVS: llvm/include/llvm/CodeGen/MachineDebugInfo.h MachineLocation.h

[Jim Laskey]

Changes in directory llvm/include/llvm/CodeGen:

MachineDebugInfo.h updated: 1.47 -> 1.48
MachineLocation.h updated: 1.2 -> 1.3
---
Log message:

Repair debug frames as a prelude to eh_frames.  Switched to using MachineMoves
by value so that clean up is less confusing (these vectors tend to be small.)


---
Diffs of the changes:  (+10 -4)

 MachineDebugInfo.h |    4 ++--
 MachineLocation.h  |   10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)


Index: llvm/include/llvm/CodeGen/MachineDebugInfo.h
diff -u llvm/include/llvm/CodeGen/MachineDebugInfo.h:1.47 llvm/include/llvm/CodeGen/MachineDebugInfo.h:1.48
--- llvm/include/llvm/CodeGen/MachineDebugInfo.h:1.47	Thu Nov 30 08:35:45 2006
+++ llvm/include/llvm/CodeGen/MachineDebugInfo.h	Wed Jan 24 12:45:12 2007
@@ -985,7 +985,7 @@
   
   // FrameMoves - List of moves done by a function's prolog.  Used to construct
   // frame maps by debug consumers.
-  std::vector<MachineMove *> FrameMoves;
+  std::vector<MachineMove> FrameMoves;
 
 public:
   MachineDebugInfo();
@@ -1145,7 +1145,7 @@
   
   /// getFrameMoves - Returns a reference to a list of moves done in the current
   /// function's prologue.  Used to construct frame maps for debug comsumers.
-  std::vector<MachineMove *> &getFrameMoves() { return FrameMoves; }
+  std::vector<MachineMove> &getFrameMoves() { return FrameMoves; }
 
 }; // End class MachineDebugInfo
 


Index: llvm/include/llvm/CodeGen/MachineLocation.h
diff -u llvm/include/llvm/CodeGen/MachineLocation.h:1.2 llvm/include/llvm/CodeGen/MachineLocation.h:1.3
--- llvm/include/llvm/CodeGen/MachineLocation.h:1.2	Fri Apr  7 11:34:45 2006
+++ llvm/include/llvm/CodeGen/MachineLocation.h	Wed Jan 24 12:45:12 2007
@@ -79,10 +79,16 @@
   unsigned LabelID;                     // Label ID number for post-instruction
                                         // address when result of move takes
                                         // effect.
-  const MachineLocation Destination;    // Move to location.
-  const MachineLocation Source;         // Move from location.
+  MachineLocation Destination;          // Move to location.
+  MachineLocation Source;               // Move from location.
   
 public:
+  MachineMove()
+  : LabelID(0)
+  , Destination()
+  , Source()
+  {}
+
   MachineMove(unsigned ID, MachineLocation &D, MachineLocation &S)
   : LabelID(ID)
   , Destination(D)