diff --git a/js/src/jit/ABIFunctionList-inl.h b/js/src/jit/ABIFunctionList-inl.h index c0361f611aee..a2befbabc3e6 100644 --- a/js/src/jit/ABIFunctionList-inl.h +++ b/js/src/jit/ABIFunctionList-inl.h @@ -35,6 +35,8 @@ #include "js/Conversions.h" // JS::ToInt32 #include "js/experimental/JitInfo.h" // JSJitGetterOp, JSJitSetterOp, JSJitMethodOp +#include "js/Utility.h" // js_free + #include "vm/ArgumentsObject.h" // js::ArgumentsObject::finishForIonPure #include "vm/RegExpShared.h" // js::ExecuteRegExpAtomRaw #include "vm/TraceLogging.h" // js::TraceLogStartEventPrivate, @@ -67,6 +69,7 @@ namespace jit { _(js::ecmaHypot) \ _(js::ecmaPow) \ _(js::ExecuteRegExpAtomRaw) \ + _(js_free) \ _(js::hypot3) \ _(js::hypot4) \ _(js::Int32ToStringHelperPure) \ diff --git a/js/src/jit/CodeGenerator.cpp b/js/src/jit/CodeGenerator.cpp index 63f40e36fe35..87345203f183 100644 --- a/js/src/jit/CodeGenerator.cpp +++ b/js/src/jit/CodeGenerator.cpp @@ -9900,10 +9900,11 @@ void JitRuntime::generateFreeStub(MacroAssembler& masm) { const Register regTemp = regs.takeAnyGeneral(); MOZ_ASSERT(regTemp != regSlots); + using Fn = void (*)(void* p); masm.setupUnalignedABICall(regTemp); masm.passABIArg(regSlots); - masm.callWithABI(JS_FUNC_TO_DATA_PTR(void*, js_free), MoveOp::GENERAL, - CheckUnsafeCallWithABI::DontCheckOther); + masm.callWithABI(MoveOp::GENERAL, + CheckUnsafeCallWithABI::DontCheckOther); masm.PopRegsInMask(save);