Bug 1466189: followup patch to make discard stack unconditional r=jandem

--HG--
extra : rebase_source : bf19d39abb1ee0857ea73f72f1aa26f24ef1cf38
This commit is contained in:
Matthew Gaudet 2018-06-07 11:25:02 -04:00
parent 714319bf73
commit 9d8092fba3
2 changed files with 4 additions and 2 deletions

View file

@ -996,12 +996,13 @@ BaselineCacheIRCompiler::emitCompareStringResult()
if (!addFailurePath(&failure))
return false;
allocator.discardStack(masm);
Label slow, done;
masm.compareStrings(op, left, right, scratch, &slow);
masm.jump(&done);
masm.bind(&slow);
{
allocator.discardStack(masm);
AutoStubFrame stubFrame(*this);
stubFrame.enter(masm, scratch);

View file

@ -1376,13 +1376,14 @@ IonCacheIRCompiler::emitCompareStringResult()
if (!addFailurePath(&failure))
return false;
allocator.discardStack(masm);
Label slow, done;
masm.compareStrings(op, left, right, scratch, &slow);
masm.jump(&done);
masm.bind(&slow);
allocator.discardStack(masm);
prepareVMCall(masm);
masm.Push(right);
masm.Push(left);