$OpenBSD$ index b34483c..63b3ff2 100644 --- js/src/jit/arm/MacroAssembler-arm.cpp.orig Fri Feb 20 15:40:37 2015 +++ js/src/jit/arm/MacroAssembler-arm.cpp Fri Feb 20 15:40:37 2015 @@ -3984,25 +3984,18 @@ MacroAssemblerARMCompat::callWithABI(const Address &fun, MoveOp::Type result) } void -MacroAssemblerARMCompat::handleFailureWithHandler(void *handler) +MacroAssemblerARMCompat::handleFailureWithHandlerTail(void *handler) { // Reserve space for exception information. int size = (sizeof(ResumeFromException) + 7) & ~7; ma_sub(Imm32(size), sp); ma_mov(sp, r0); - // Ask for an exception handler. + // Call the handler. setupUnalignedABICall(1, r1); passABIArg(r0); callWithABI(handler); - JitCode *excTail = GetIonContext()->runtime->jitRuntime()->getExceptionTail(); - branch(excTail); -} - -void -MacroAssemblerARMCompat::handleFailureWithHandlerTail() -{ Label entryFrame; Label catch_; Label finally;