Bug 926514 - Revert "Bug 925088 - SpiderMonkey: Fold loads into branchTest32. r=nbp"

This commit is contained in:
Dan Gohman 2013-10-20 09:46:26 -07:00
parent 90876d2f60
commit e5ca28a498
2 changed files with 5 additions and 4 deletions

View File

@ -4540,8 +4540,8 @@ CodeGenerator::visitCharCodeAt(LCharCodeAt *lir)
return false;
Address lengthAndFlagsAddr(str, JSString::offsetOfLengthAndFlags());
masm.branchTest32(Assembler::Zero, lengthAndFlagsAddr, Imm32(JSString::FLAGS_MASK), ool->entry());
masm.loadPtr(lengthAndFlagsAddr, output);
masm.branchTest32(Assembler::Zero, output, Imm32(JSString::FLAGS_MASK), ool->entry());
// getChars
Address charsAddr(str, JSString::offsetOfChars());

View File

@ -860,10 +860,11 @@ MacroAssembler::compareStrings(JSOp op, Register left, Register right, Register
void
MacroAssembler::checkInterruptFlagsPar(const Register &tempReg,
Label *fail)
Label *fail)
{
movePtr(ImmPtr(&GetIonContext()->runtime->interrupt), tempReg);
branch32(Assembler::NonZero, Address(tempReg, 0), Imm32(0), fail);
load32(Address(tempReg, 0), tempReg);
branchTest32(Assembler::NonZero, tempReg, tempReg, fail);
}
void