$OpenBSD$ index 9a9f995..0db799c 100644 --- js/src/jit/x64/MacroAssembler-x64.cpp.orig Fri Feb 20 15:40:37 2015 +++ js/src/jit/x64/MacroAssembler-x64.cpp Fri Feb 20 15:40:37 2015 @@ -287,24 +287,17 @@ MacroAssemblerX64::callWithABI(Address fun, MoveOp::Type result) } void -MacroAssemblerX64::handleFailureWithHandler(void *handler) +MacroAssemblerX64::handleFailureWithHandlerTail(void *handler) { // Reserve space for exception information. subq(Imm32(sizeof(ResumeFromException)), rsp); movq(rsp, rax); - // Ask for an exception handler. + // Call the handler. setupUnalignedABICall(1, rcx); passABIArg(rax); callWithABI(handler); - JitCode *excTail = GetIonContext()->runtime->jitRuntime()->getExceptionTail(); - jmp(excTail); -} - -void -MacroAssemblerX64::handleFailureWithHandlerTail() -{ Label entryFrame; Label catch_; Label finally;