From 2501df81955781747c4d35916fa4e17235c18b04 Mon Sep 17 00:00:00 2001
From: Jiaxun Yang <jiaxun.yang@flygoat.com>
Date: Tue, 12 May 2020 12:40:09 +0800
Subject: Bug 1271968 - wasm: MIPS: Port mixed jump for wasm.

Tag: #1542
---
 js/src/jit/mips-shared/Assembler-mips-shared.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'js')

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);
 }
 
-- 
cgit v1.2.3