summaryrefslogtreecommitdiffstats
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rw-r--r--js/src/jit/mips-shared/Assembler-mips-shared.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/js/src/jit/mips-shared/Assembler-mips-shared.cpp b/js/src/jit/mips-shared/Assembler-mips-shared.cpp
index e78d33549..63edc0b02 100644
--- a/js/src/jit/mips-shared/Assembler-mips-shared.cpp
+++ b/js/src/jit/mips-shared/Assembler-mips-shared.cpp
@@ -101,6 +101,11 @@ AssemblerMIPSShared::asmMergeWith(const AssemblerMIPSShared& other)
{
if (!AssemblerShared::asmMergeWith(size(), other))
return false;
+ for (size_t i = 0; i < other.numMixedJumps(); i++) {
+ const MixedJumpPatch& mjp = other.mixedJumps_[i];
+ addMixedJump(BufferOffset(size() + mjp.src.getOffset()),
+ ImmPtr(size() + mjp.target), mjp.kind);
+ }
return m_buffer.appendBuffer(other.m_buffer);
}