$OpenBSD$ index cee93a5..256434d 100644 --- js/src/jit/mips/MacroAssembler-mips.cpp.orig Fri Feb 20 15:40:37 2015 +++ js/src/jit/mips/MacroAssembler-mips.cpp Fri Feb 20 15:40:37 2015 @@ -3139,25 +3139,18 @@ MacroAssemblerMIPSCompat::callWithABI(const Address &fun, MoveOp::Type result) } void -MacroAssemblerMIPSCompat::handleFailureWithHandler(void *handler) +MacroAssemblerMIPSCompat::handleFailureWithHandlerTail(void *handler) { // Reserve space for exception information. int size = (sizeof(ResumeFromException) + StackAlignment) & ~(StackAlignment - 1); ma_subu(StackPointer, StackPointer, Imm32(size)); ma_move(a0, StackPointer); // Use a0 since it is a first function argument - // Ask for an exception handler. + // Call the handler. setupUnalignedABICall(1, a1); passABIArg(a0); callWithABI(handler); - JitCode *excTail = GetIonContext()->runtime->jitRuntime()->getExceptionTail(); - branch(excTail); -} - -void -MacroAssemblerMIPSCompat::handleFailureWithHandlerTail() -{ Label entryFrame; Label catch_; Label finally;