diff options
| -rw-r--r-- | lib/Target/X86/X86FastISel.cpp | 5 | ||||
| -rw-r--r-- | lib/Target/X86/X86RegisterInfo.cpp | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/lib/Target/X86/X86FastISel.cpp b/lib/Target/X86/X86FastISel.cpp index a81ecfeace..3056e39c91 100644 --- a/lib/Target/X86/X86FastISel.cpp +++ b/lib/Target/X86/X86FastISel.cpp @@ -1220,6 +1220,7 @@ bool X86FastISel::X86SelectCall(Instruction *I) { bool Emitted = X86FastEmitExtend(ISD::SIGN_EXTEND, VA.getLocVT(), Arg, ArgVT, Arg); assert(Emitted && "Failed to emit a sext!"); Emitted=Emitted; + Emitted = true; ArgVT = VA.getLocVT(); break; } @@ -1227,6 +1228,7 @@ bool X86FastISel::X86SelectCall(Instruction *I) { bool Emitted = X86FastEmitExtend(ISD::ZERO_EXTEND, VA.getLocVT(), Arg, ArgVT, Arg); assert(Emitted && "Failed to emit a zext!"); Emitted=Emitted; + Emitted = true; ArgVT = VA.getLocVT(); break; } @@ -1251,6 +1253,7 @@ bool X86FastISel::X86SelectCall(Instruction *I) { bool Emitted = TII.copyRegToReg(*MBB, MBB->end(), VA.getLocReg(), Arg, RC, RC); assert(Emitted && "Failed to emit a copy instruction!"); Emitted=Emitted; + Emitted = true; RegArgs.push_back(VA.getLocReg()); } else { unsigned LocMemOffset = VA.getLocMemOffset(); @@ -1278,6 +1281,7 @@ bool X86FastISel::X86SelectCall(Instruction *I) { unsigned Base = getInstrInfo()->getGlobalBaseReg(&MF); bool Emitted = TII.copyRegToReg(*MBB, MBB->end(), X86::EBX, Base, RC, RC); assert(Emitted && "Failed to emit a copy instruction!"); Emitted=Emitted; + Emitted = true; } // Issue the call. @@ -1329,6 +1333,7 @@ bool X86FastISel::X86SelectCall(Instruction *I) { bool Emitted = TII.copyRegToReg(*MBB, MBB->end(), ResultReg, RVLocs[0].getLocReg(), DstRC, SrcRC); assert(Emitted && "Failed to emit a copy instruction!"); Emitted=Emitted; + Emitted = true; if (CopyVT != RVLocs[0].getValVT()) { // Round the F80 the right size, which also moves to the appropriate xmm // register. This is accomplished by storing the F80 value in memory and diff --git a/lib/Target/X86/X86RegisterInfo.cpp b/lib/Target/X86/X86RegisterInfo.cpp index e1699f6b5a..b650d22050 100644 --- a/lib/Target/X86/X86RegisterInfo.cpp +++ b/lib/Target/X86/X86RegisterInfo.cpp @@ -349,6 +349,7 @@ X86RegisterInfo::getFrameIndexOffset(MachineFunction &MF, int FI) const { else { unsigned Align = MF.getFrameInfo()->getObjectAlignment(FI); assert( (-(Offset + StackSize)) % Align == 0); + Align = 0; return Offset + StackSize; } @@ -501,6 +502,7 @@ X86RegisterInfo::processFunctionBeforeFrameFinalized(MachineFunction &MF) const{ TailCallReturnAddrDelta); assert(FrameIdx == MF.getFrameInfo()->getObjectIndexBegin() && "Slot for EBP register must be last in order to be found!"); + FrameIdx = 0; } } |