From 8c9b4de5744ea6c4ce8b79e8a55130df268761cd Mon Sep 17 00:00:00 2001 From: Alkis Evlogimenos Date: Sun, 15 Aug 2004 09:18:55 +0000 Subject: [PATCH] Make this compile on gc 3.4.1 (static_cast to non-const type was not allowed). git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@15766 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Target/TargetFrameInfo.h | 2 +- lib/CodeGen/PrologEpilogInserter.cpp | 4 ++-- lib/Target/PowerPC/PPCFrameInfo.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/llvm/Target/TargetFrameInfo.h b/include/llvm/Target/TargetFrameInfo.h index c727561ab2a..dfdca8dab77 100644 --- a/include/llvm/Target/TargetFrameInfo.h +++ b/include/llvm/Target/TargetFrameInfo.h @@ -67,7 +67,7 @@ public: /// spilled at. If a register is not listed here, the code generator is /// allowed to spill it anywhere it chooses. /// - virtual std::pair * + virtual const std::pair * getCalleeSaveSpillSlots(unsigned &NumEntries) const { NumEntries = 0; return 0; diff --git a/lib/CodeGen/PrologEpilogInserter.cpp b/lib/CodeGen/PrologEpilogInserter.cpp index 20442129650..1a07013ac30 100644 --- a/lib/CodeGen/PrologEpilogInserter.cpp +++ b/lib/CodeGen/PrologEpilogInserter.cpp @@ -163,7 +163,7 @@ void PEI::calculateCallerSavedRegisters(MachineFunction &Fn) { return; // Early exit if no caller saved registers are modified! unsigned NumFixedSpillSlots; - std::pair *FixedSpillSlots = + const std::pair *FixedSpillSlots = TFI->getCalleeSaveSpillSlots(NumFixedSpillSlots); // Now that we know which registers need to be saved and restored, allocate @@ -175,7 +175,7 @@ void PEI::calculateCallerSavedRegisters(MachineFunction &Fn) { // Check to see if this physreg must be spilled to a particular stack slot // on this target. - std::pair *FixedSlot = FixedSpillSlots; + const std::pair *FixedSlot = FixedSpillSlots; while (FixedSlot != FixedSpillSlots+NumFixedSpillSlots && FixedSlot->first != Reg) ++FixedSlot; diff --git a/lib/Target/PowerPC/PPCFrameInfo.h b/lib/Target/PowerPC/PPCFrameInfo.h index ba6209fac5f..c72da9ad26a 100644 --- a/lib/Target/PowerPC/PPCFrameInfo.h +++ b/lib/Target/PowerPC/PPCFrameInfo.h @@ -33,10 +33,10 @@ public: LR[0].second = 8; } - std::pair * + const std::pair * getCalleeSaveSpillSlots(unsigned &NumEntries) const { NumEntries = 1; - return static_cast *>(LR); + return static_cast *>(LR); } };