Change:

[oota-llvm.git] / lib / CodeGen / CallingConvLower.cpp

diff --git a/lib/CodeGen/CallingConvLower.cpp b/lib/CodeGen/CallingConvLower.cpp
index bc61ec8ed0a49e4b1ca74bfb7abe2de10c04b592..14eb0541dc8d7866d7ee62afd69bfa977f216ece 100644 (file)
--- a/lib/CodeGen/CallingConvLower.cpp
+++ b/lib/CodeGen/CallingConvLower.cpp
@@ -24,11 +24,11 @@
 using namespace llvm;
 
 CCState::CCState(CallingConv::ID CC, bool isVarArg, MachineFunction &mf,
-                const TargetMachine &tm,
-                 SmallVector<CCValAssign, 16> &locs, LLVMContext &C)
+                 const TargetMachine &tm, SmallVector<CCValAssign, 16> &locs,
+                 LLVMContext &C)
   : CallingConv(CC), IsVarArg(isVarArg), MF(mf), TM(tm),
     TRI(*TM.getRegisterInfo()), Locs(locs), Context(C),
-    CallOrPrologue(Invalid) {
+    CallOrPrologue(Unknown) {
   // No stack is used.
   StackOffset = 0;
 
@@ -51,7 +51,7 @@ void CCState::HandleByVal(unsigned ValNo, MVT ValVT,
     Align = MinAlign;
   if (MF.getFrameInfo()->getMaxAlignment() < Align)
     MF.getFrameInfo()->setMaxAlignment(Align);
-  TM.getTargetLowering()->HandleByVal(const_cast<CCState*>(this), Size);
+  TM.getTargetLowering()->HandleByVal(this, Size);
   unsigned Offset = AllocateStack(Size, Align);
   addLoc(CCValAssign::getMem(ValNo, ValVT, Offset, LocVT, LocInfo));
 }