aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/llvm/CodeGen/MachineDebugInfo.h4
-rw-r--r--include/llvm/CodeGen/MachineLocation.h10
-rw-r--r--include/llvm/Target/MRegisterInfo.h2
3 files changed, 11 insertions, 5 deletions
diff --git a/include/llvm/CodeGen/MachineDebugInfo.h b/include/llvm/CodeGen/MachineDebugInfo.h
index aa968f49a8..1676f6b85b 100644
--- a/include/llvm/CodeGen/MachineDebugInfo.h
+++ b/include/llvm/CodeGen/MachineDebugInfo.h
@@ -985,7 +985,7 @@ private:
// 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 @@ public:
/// 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
diff --git a/include/llvm/CodeGen/MachineLocation.h b/include/llvm/CodeGen/MachineLocation.h
index ab6a82b14f..023962dd6a 100644
--- a/include/llvm/CodeGen/MachineLocation.h
+++ b/include/llvm/CodeGen/MachineLocation.h
@@ -79,10 +79,16 @@ private:
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)
diff --git a/include/llvm/Target/MRegisterInfo.h b/include/llvm/Target/MRegisterInfo.h
index 29fd6b19f0..e0f0cd428c 100644
--- a/include/llvm/Target/MRegisterInfo.h
+++ b/include/llvm/Target/MRegisterInfo.h
@@ -456,7 +456,7 @@ public:
/// getInitialFrameState - Returns a list of machine moves that are assumed
/// on entry to all functions. Note that LabelID is ignored (assumed to be
/// the beginning of the function.)
- virtual void getInitialFrameState(std::vector<MachineMove *> &Moves) const;
+ virtual void getInitialFrameState(std::vector<MachineMove> &Moves) const;
};
// This is useful when building DenseMaps keyed on virtual registers