author | Jan de Mooij <jdemooij@mozilla.com> |
Tue, 12 Mar 2019 14:19:30 +0000 (2019-03-12) | |
changeset 463676 | aa1745f5137ca071c565bc56425c8fbe4a0f5fcb |
parent 463675 | 3aa21d7302e79b1e9324ea4933c719f200de2ab1 |
child 463677 | 56159f3c0acadb0b59437d61402c569c76e38984 |
push id | 35691 |
push user | nbeleuzu@mozilla.com |
push date | Tue, 12 Mar 2019 21:43:52 +0000 (2019-03-12) |
treeherder | mozilla-central@add98afa5f0c [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | tcampbell |
bugs | 1530937 |
milestone | 67.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/js/src/jit/BaselineIC.cpp +++ b/js/src/jit/BaselineIC.cpp @@ -5779,18 +5779,19 @@ bool ICCompare_Fallback::Compiler::gener HandleValue, HandleValue, MutableHandleValue); return tailCallVM<Fn, DoCompareFallback>(masm); } // // NewArray_Fallback // -bool DoNewArray(JSContext* cx, BaselineFrame* frame, ICNewArray_Fallback* stub, - uint32_t length, MutableHandleValue res) { +bool DoNewArrayFallback(JSContext* cx, BaselineFrame* frame, + ICNewArray_Fallback* stub, uint32_t length, + MutableHandleValue res) { stub->incrementEnteredCount(); FallbackICSpew(cx, stub, "NewArray"); RootedObject obj(cx); if (stub->templateObject()) { RootedObject templateObject(cx, stub->templateObject()); obj = NewArrayOperationWithTemplate(cx, templateObject); if (!obj) { @@ -5823,24 +5824,24 @@ bool ICNewArray_Fallback::Compiler::gene EmitRestoreTailCallReg(masm); masm.push(R0.scratchReg()); // length masm.push(ICStubReg); // stub. masm.pushBaselineFramePtr(BaselineFrameReg, R0.scratchReg()); using Fn = bool (*)(JSContext*, BaselineFrame*, ICNewArray_Fallback*, uint32_t, MutableHandleValue); - return tailCallVM<Fn, DoNewArray>(masm); + return tailCallVM<Fn, DoNewArrayFallback>(masm); } // // NewObject_Fallback // -bool DoNewObject(JSContext* cx, BaselineFrame* frame, - ICNewObject_Fallback* stub, MutableHandleValue res) { +bool DoNewObjectFallback(JSContext* cx, BaselineFrame* frame, + ICNewObject_Fallback* stub, MutableHandleValue res) { stub->incrementEnteredCount(); FallbackICSpew(cx, stub, "NewObject"); RootedObject obj(cx); RootedObject templateObject(cx, stub->templateObject()); if (templateObject) { MOZ_ASSERT( @@ -5877,13 +5878,13 @@ bool DoNewObject(JSContext* cx, Baseline bool ICNewObject_Fallback::Compiler::generateStubCode(MacroAssembler& masm) { EmitRestoreTailCallReg(masm); masm.push(ICStubReg); // stub. pushStubPayload(masm, R0.scratchReg()); using Fn = bool (*)(JSContext*, BaselineFrame*, ICNewObject_Fallback*, MutableHandleValue); - return tailCallVM<Fn, DoNewObject>(masm); + return tailCallVM<Fn, DoNewObjectFallback>(masm); } } // namespace jit } // namespace js
--- a/js/src/jit/BaselineIC.h +++ b/js/src/jit/BaselineIC.h @@ -2813,22 +2813,23 @@ extern bool DoRestFallback(JSContext* cx extern bool DoUnaryArithFallback(JSContext* cx, BaselineFrame* frame, ICUnaryArith_Fallback* stub, HandleValue val, MutableHandleValue res); extern bool DoBinaryArithFallback(JSContext* cx, BaselineFrame* frame, ICBinaryArith_Fallback* stub, HandleValue lhs, HandleValue rhs, MutableHandleValue ret); -extern bool DoNewArray(JSContext* cx, BaselineFrame* frame, - ICNewArray_Fallback* stub, uint32_t length, - MutableHandleValue res); - -extern bool DoNewObject(JSContext* cx, BaselineFrame* frame, - ICNewObject_Fallback* stub, MutableHandleValue res); +extern bool DoNewArrayFallback(JSContext* cx, BaselineFrame* frame, + ICNewArray_Fallback* stub, uint32_t length, + MutableHandleValue res); + +extern bool DoNewObjectFallback(JSContext* cx, BaselineFrame* frame, + ICNewObject_Fallback* stub, + MutableHandleValue res); extern bool DoCompareFallback(JSContext* cx, BaselineFrame* frame, ICCompare_Fallback* stub, HandleValue lhs, HandleValue rhs, MutableHandleValue ret); } // namespace jit } // namespace js
--- a/js/src/jit/BaselineICList.h +++ b/js/src/jit/BaselineICList.h @@ -23,17 +23,16 @@ namespace jit { _(TypeUpdate_Fallback) \ _(TypeUpdate_SingleObject) \ _(TypeUpdate_ObjectGroup) \ _(TypeUpdate_PrimitiveSet) \ _(TypeUpdate_AnyValue) \ \ _(NewArray_Fallback) \ _(NewObject_Fallback) \ - _(NewObject_WithTemplate) \ \ _(ToBool_Fallback) \ \ _(UnaryArith_Fallback) \ \ _(Call_Fallback) \ _(Call_Scripted) \ _(Call_AnyScripted) \
--- a/js/src/jit/VMFunctionList-inl.h +++ b/js/src/jit/VMFunctionList-inl.h @@ -261,18 +261,18 @@ namespace jit { _(DoGetIntrinsicFallback, js::jit::DoGetIntrinsicFallback, 0) \ _(DoGetIteratorFallback, js::jit::DoGetIteratorFallback, 1) \ _(DoGetNameFallback, js::jit::DoGetNameFallback, 0) \ _(DoGetPropFallback, js::jit::DoGetPropFallback, 1) \ _(DoGetPropSuperFallback, js::jit::DoGetPropSuperFallback, 0) \ _(DoHasOwnFallback, js::jit::DoHasOwnFallback, 2) \ _(DoInFallback, js::jit::DoInFallback, 2) \ _(DoInstanceOfFallback, js::jit::DoInstanceOfFallback, 2) \ - _(DoNewArray, js::jit::DoNewArray, 0) \ - _(DoNewObject, js::jit::DoNewObject, 0) \ + _(DoNewArrayFallback, js::jit::DoNewArrayFallback, 0) \ + _(DoNewObjectFallback, js::jit::DoNewObjectFallback, 0) \ _(DoRestFallback, js::jit::DoRestFallback, 0) \ _(DoSetElemFallback, js::jit::DoSetElemFallback, 2) \ _(DoSetPropFallback, js::jit::DoSetPropFallback, 1) \ _(DoToBoolFallback, js::jit::DoToBoolFallback, 0) \ _(DoTypeMonitorFallback, js::jit::DoTypeMonitorFallback, 0) \ _(DoTypeOfFallback, js::jit::DoTypeOfFallback, 0) \ _(DoUnaryArithFallback, js::jit::DoUnaryArithFallback, 1) \ _(GeneratorThrowOrReturn, js::jit::GeneratorThrowOrReturn, 0)