Bug 1636916 part 2 - Add branchTestGCThing to the MacroAssembler. r=jonco

Depends on D74647

Differential Revision: https://phabricator.services.mozilla.com/D74648

js/src/jit/MacroAssembler.h

@@ -1571,6 +1571,9 @@ class MacroAssembler : public MacroAssemblerSpecific {
                                 Label* label) PER_SHARED_ARCH;
   inline void branchTestGCThing(Condition cond, const BaseIndex& address,
                                 Label* label) PER_SHARED_ARCH;
+  inline void branchTestGCThing(Condition cond, const ValueOperand& value,
+                                Label* label)
+      DEFINED_ON(arm, arm64, x86_shared);
 
   inline void branchTestPrimitive(Condition cond, const ValueOperand& value,
                                   Label* label)

js/src/jit/arm/MacroAssembler-arm-inl.h

@@ -1815,6 +1815,12 @@ void MacroAssembler::branchTestGCThing(Condition cond, const BaseIndex& address,
   branchTestGCThingImpl(cond, address, label);
 }
 
+void MacroAssembler::branchTestGCThing(Condition cond,
+                                       const ValueOperand& value,
+                                       Label* label) {
+  branchTestGCThingImpl(cond, value, label);
+}
+
 template <typename T>
 void MacroAssembler::branchTestGCThingImpl(Condition cond, const T& t,
                                            Label* label) {

js/src/jit/arm/MacroAssembler-arm.cpp

@@ -2446,6 +2446,11 @@ Assembler::Condition MacroAssemblerARMCompat::testPrimitive(
   return testPrimitive(cond, value.typeReg());
 }
 
+Assembler::Condition MacroAssemblerARMCompat::testGCThing(
+    Assembler::Condition cond, const ValueOperand& value) {
+  return testGCThing(cond, value.typeReg());
+}
+
 // Register-based tests.
 Assembler::Condition MacroAssemblerARMCompat::testInt32(
     Assembler::Condition cond, Register tag) {
@@ -2517,6 +2522,13 @@ Assembler::Condition MacroAssemblerARMCompat::testPrimitive(
   return cond == Equal ? Below : AboveOrEqual;
 }
 
+Assembler::Condition MacroAssemblerARMCompat::testGCThing(
+    Assembler::Condition cond, Register tag) {
+  MOZ_ASSERT(cond == Equal || cond == NotEqual);
+  ma_cmp(tag, ImmTag(JS::detail::ValueLowerInclGCThingTag));
+  return cond == Equal ? AboveOrEqual : Below;
+}
+
 Assembler::Condition MacroAssemblerARMCompat::testGCThing(
     Assembler::Condition cond, const Address& address) {
   MOZ_ASSERT(cond == Equal || cond == NotEqual);

js/src/jit/arm/MacroAssembler-arm.h

@@ -774,6 +774,7 @@ class MacroAssemblerARMCompat : public MacroAssemblerARM {
   Condition testMagic(Condition cond, const ValueOperand& value);
 
   Condition testPrimitive(Condition cond, const ValueOperand& value);
+  Condition testGCThing(Condition cond, const ValueOperand& value);
 
   // Register-based tests.
   Condition testInt32(Condition cond, Register tag);
@@ -788,6 +789,7 @@ class MacroAssemblerARMCompat : public MacroAssemblerARM {
   Condition testNumber(Condition cond, Register tag);
   Condition testMagic(Condition cond, Register tag);
   Condition testPrimitive(Condition cond, Register tag);
+  Condition testGCThing(Condition cond, Register tag);
 
   Condition testGCThing(Condition cond, const Address& address);
   Condition testMagic(Condition cond, const Address& address);

js/src/jit/arm64/MacroAssembler-arm64-inl.h

@@ -1529,6 +1529,12 @@ void MacroAssembler::branchTestGCThing(Condition cond, const BaseIndex& address,
   branchTestGCThingImpl(cond, address, label);
 }
 
+void MacroAssembler::branchTestGCThing(Condition cond,
+                                       const ValueOperand& value,
+                                       Label* label) {
+  branchTestGCThingImpl(cond, value, label);
+}
+
 template <typename T>
 void MacroAssembler::branchTestGCThingImpl(Condition cond, const T& src,
                                            Label* label) {

js/src/jit/arm64/MacroAssembler-arm64.h

@@ -1638,6 +1638,13 @@ class MacroAssemblerCompat : public vixl::MacroAssembler {
     splitSignExtTag(value, scratch);
     return testMagic(cond, scratch);
   }
+  Condition testGCThing(Condition cond, const ValueOperand& value) {
+    vixl::UseScratchRegisterScope temps(this);
+    const Register scratch = temps.AcquireX().asUnsized();
+    MOZ_ASSERT(value.valueReg() != scratch);
+    splitSignExtTag(value, scratch);
+    return testGCThing(cond, scratch);
+  }
   Condition testError(Condition cond, const ValueOperand& value) {
     return testMagic(cond, value);
   }

js/src/jit/x86-shared/MacroAssembler-x86-shared-inl.h

@@ -908,6 +908,12 @@ void MacroAssembler::branchTestGCThing(Condition cond, const BaseIndex& address,
   branchTestGCThingImpl(cond, address, label);
 }
 
+void MacroAssembler::branchTestGCThing(Condition cond,
+                                       const ValueOperand& value,
+                                       Label* label) {
+  branchTestGCThingImpl(cond, value, label);
+}
+
 template <typename T>
 void MacroAssembler::branchTestGCThingImpl(Condition cond, const T& t,
                                            Label* label) {