maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix the build bot break caused by rL261441. 

The patch has a necessary call to a function inside an assert. Which is fine
when you have asserts turned on. Not so much when they're off. Sorry about
the regression.

llvm-svn: 261447
This commit is contained in:
Nemanja Ivanovic 2016-02-20 20:45:37 +00:00
parent 9ab99eecc3
commit daf0ca2341
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
llvm/lib/Target/PowerPC/PPCFrameLowering.cpp
View File

@ -779,11 +779,14 @@ void PPCFrameLowering::emitPrologue(MachineFunction &MF,
assert((isPPC64 || !isSVR4ABI || !(!FrameSize && (MustSaveLR || HasFP))) && assert((isPPC64 || !isSVR4ABI || !(!FrameSize && (MustSaveLR || HasFP))) &&
"FrameSize must be >0 to save/restore the FP or LR for 32-bit SVR4."); "FrameSize must be >0 to save/restore the FP or LR for 32-bit SVR4.");
assert(findScratchRegister(&MBB, false, twoUniqueScratchRegsRequired(&MBB), // Using the same bool variable as below to supress compiler warnings.
&ScratchReg, &TempReg) && bool SingleScratchReg =
findScratchRegister(&MBB, false, twoUniqueScratchRegsRequired(&MBB),
&ScratchReg, &TempReg);
assert(SingleScratchReg &&
"Required number of registers not available in this block"); "Required number of registers not available in this block");
bool SingleScratchReg = ScratchReg == TempReg; SingleScratchReg = ScratchReg == TempReg;
int LROffset = getReturnSaveOffset(); int LROffset = getReturnSaveOffset();
@ -1133,10 +1136,13 @@ void PPCFrameLowering::emitEpilogue(MachineFunction &MF,
int FPOffset = 0; int FPOffset = 0;
assert(findScratchRegister(&MBB, true, false, &ScratchReg, &TempReg) && // Using the same bool variable as below to supress compiler warnings.
bool SingleScratchReg = findScratchRegister(&MBB, true, false, &ScratchReg,
&TempReg);
assert(SingleScratchReg &&
"Could not find an available scratch register"); "Could not find an available scratch register");
bool SingleScratchReg = ScratchReg == TempReg; SingleScratchReg = ScratchReg == TempReg;
if (HasFP) { if (HasFP) {
if (isSVR4ABI) { if (isSVR4ABI) {