From: qiaopengcheng <qiaopengcheng-hf@loongson.cn>
Date: Sat, 1 Jun 2019 22:28:24 +0000 (+0900)
Subject: Bug 1556197 - amend Bug-1544631 for fixing mips32.
X-Git-Tag: archive/raspbian/68.5.0esr-1_deb10u1+rpi1^2~29
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=baff705f85488d1b6be26b438afda73d98890b0a;p=firefox-esr.git

Bug 1556197 - amend Bug-1544631 for fixing mips32.


Gbp-Pq: Topic fixes
Gbp-Pq: Name Bug-1556197-amend-Bug-1544631-for-fixing-mips32.patch
---

diff --git a/js/src/jit/mips32/MacroAssembler-mips32-inl.h b/js/src/jit/mips32/MacroAssembler-mips32-inl.h
index 1f7f4d1cf31..06d8773e92a 100644
--- a/js/src/jit/mips32/MacroAssembler-mips32-inl.h
+++ b/js/src/jit/mips32/MacroAssembler-mips32-inl.h
@@ -820,19 +820,23 @@ void MacroAssembler::branchTestSymbol(Condition cond, const ValueOperand& value,
 
 void MacroAssembler::branchTestBigInt(Condition cond, Register tag,
                                       Label* label) {
-  branchTestBigIntImpl(cond, tag, label);
+  MOZ_ASSERT(cond == Equal || cond == NotEqual);
+  ma_b(tag, ImmTag(JSVAL_TAG_BIGINT), label, cond);
 }
 
 void MacroAssembler::branchTestBigInt(Condition cond, const BaseIndex& address,
                                       Label* label) {
   SecondScratchRegisterScope scratch2(*this);
-  splitTag(value, scratch2);
+  computeEffectiveAddress(address, scratch2);
+  splitTag(scratch2, scratch2);
   branchTestBigInt(cond, scratch2, label);
 }
 
 void MacroAssembler::branchTestBigInt(Condition cond, const ValueOperand& value,
                                       Label* label) {
-  branchTestBigInt(cond, value.typeReg(), label);
+  SecondScratchRegisterScope scratch2(*this);
+  splitTag(value, scratch2);
+  branchTestBigInt(cond, scratch2, label);
 }
 
 void MacroAssembler::branchTestBigIntTruthy(bool b, const ValueOperand& value,