Backed out changeset 60f939d5d3bc (bug 1630607) for SM failure at workspace/breakpad-tools/libbreakpadinjector.so on a CLOSED TREE

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

@@ -19,21 +19,6 @@
 namespace js {
 namespace jit {
 
-void MacroAssemblerCompat::boxValue(JSValueType type, Register src,
-                                    Register dest) {
-#ifdef DEBUG
-  if (type == JSVAL_TYPE_INT32 || type == JSVAL_TYPE_BOOLEAN) {
-    Label upper32BitsZeroed;
-    movePtr(ImmWord(UINT32_MAX), dest);
-    asMasm().branchPtr(Assembler::BelowOrEqual, src, dest, &upper32BitsZeroed);
-    breakpoint();
-    bind(&upper32BitsZeroed);
-  }
-#endif
-  Orr(ARMRegister(dest, 64), ARMRegister(src, 64),
-      Operand(ImmShiftedTag(type).value));
-}
-
 void MacroAssembler::clampDoubleToUint8(FloatRegister input, Register output) {
   ARMRegister dest(output, 32);
   Fcvtns(dest, ARMFPRegister(input, 64));

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

@@ -393,8 +393,10 @@ class MacroAssemblerCompat : public vixl::MacroAssembler {
     return CodeOffset(off.getOffset());
   }
 
-  void boxValue(JSValueType type, Register src, Register dest);
-
+  void boxValue(JSValueType type, Register src, Register dest) {
+    Orr(ARMRegister(dest, 64), ARMRegister(src, 64),
+        Operand(ImmShiftedTag(type).value));
+  }
   void splitSignExtTag(Register src, Register dest) {
     sbfx(ARMRegister(dest, 64), ARMRegister(src, 64), JSVAL_TAG_SHIFT,
          (64 - JSVAL_TAG_SHIFT));