$OpenBSD$ index 486a29d..475a685 100644 --- js/src/jit/JitCompartment.h.orig Fri Feb 20 15:40:37 2015 +++ js/src/jit/JitCompartment.h Fri Feb 20 15:40:37 2015 @@ -153,8 +153,9 @@ class JitRuntime // need for explicit interrupt checks. JSC::ExecutableAllocator *ionAlloc_; - // Shared post-exception-handler tail + // Shared exception-handler tail. JitCode *exceptionTail_; + JitCode *exceptionTailParallel_; // Shared post-bailout-handler tail. JitCode *bailoutTail_; @@ -214,7 +215,7 @@ class JitRuntime InlineList backedgeList_; private: - JitCode *generateExceptionTailStub(JSContext *cx); + JitCode *generateExceptionTailStub(JSContext *cx, void *handler); JitCode *generateBailoutTailStub(JSContext *cx); JitCode *generateEnterJIT(JSContext *cx, EnterJitType type); JitCode *generateArgumentsRectifier(JSContext *cx, ExecutionMode mode, void **returnAddrOut); @@ -287,6 +288,9 @@ class JitRuntime JitCode *getExceptionTail() const { return exceptionTail_; } + JitCode *getExceptionTailParallel() const { + return exceptionTailParallel_; + } JitCode *getBailoutTail() const { return bailoutTail_;