nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

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

Browse source 
--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
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
js/src/jit/BaselineCacheIRCompiler.cpp
View file

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

3
js/src/jit/IonCacheIRCompiler.cpp
View file

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