Revert "Add Smi::Zero and replace all Smi::FromInt(0) calls"

src/mips64/code-stubs-mips64.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #if V8_TARGET_ARCH_MIPS64
 
 #include "src/code-stubs.h"
 #include "src/api-arguments.h"
 #include "src/bootstrapper.h"
 #include "src/codegen.h"
@@ skipping 545 matching lines @@
   // NOTICE! This code is only reached after a smi-fast-case check, so
   // it is certain that at least one operand isn't a smi.
 
   // Handle the case where the objects are identical.  Either returns the answer
   // or goes to slow.  Only falls through if the objects were not identical.
   EmitIdenticalObjectComparison(masm, &slow, cc);
 
   // If either is a Smi (we know that not both are), then they can only
   // be strictly equal if the other is a HeapNumber.
   STATIC_ASSERT(kSmiTag == 0);
-  DCHECK_EQ(static_cast<Smi*>(0), Smi::kZero);
+  DCHECK_EQ(static_cast<Smi*>(0), Smi::FromInt(0));
   __ And(a6, lhs, Operand(rhs));
   __ JumpIfNotSmi(a6, &not_smis, a4);
   // One operand is a smi. EmitSmiNonsmiComparison generates code that can:
   // 1) Return the answer.
   // 2) Go to slow.
   // 3) Fall through to both_loaded_as_doubles.
   // 4) Jump to rhs_not_nan.
   // In cases 3 and 4 we have found out we were dealing with a number-number
   // comparison and the numbers have been loaded into f12 and f14 as doubles,
   // or in GP registers (a0, a1, a2, a3) depending on the presence of the FPU.
@@ skipping 3683 matching lines @@
     Label allocate, done_allocate;
     __ Allocate(JSArray::kSize, v0, a0, a1, &allocate, NO_ALLOCATION_FLAGS);
     __ bind(&done_allocate);
 
     // Setup the rest parameter array in v0.
     __ LoadNativeContextSlot(Context::JS_ARRAY_FAST_ELEMENTS_MAP_INDEX, a1);
     __ sd(a1, FieldMemOperand(v0, JSArray::kMapOffset));
     __ LoadRoot(a1, Heap::kEmptyFixedArrayRootIndex);
     __ sd(a1, FieldMemOperand(v0, JSArray::kPropertiesOffset));
     __ sd(a1, FieldMemOperand(v0, JSArray::kElementsOffset));
-    __ Move(a1, Smi::kZero);
+    __ Move(a1, Smi::FromInt(0));
     __ Ret(USE_DELAY_SLOT);
     __ sd(a1, FieldMemOperand(v0, JSArray::kLengthOffset));  // In delay slot
     STATIC_ASSERT(JSArray::kSize == 4 * kPointerSize);
 
     // Fall back to %AllocateInNewSpace.
     __ bind(&allocate);
     {
       FrameScope scope(masm, StackFrame::INTERNAL);
       __ Push(Smi::FromInt(JSArray::kSize));
       __ CallRuntime(Runtime::kAllocateInNewSpace);
@@ skipping 146 matching lines @@
   __ mov(a6, a5);
 
   __ bind(&try_allocate);
 
   // Compute the sizes of backing store, parameter map, and arguments object.
   // 1. Parameter map, has 2 extra words containing context and backing store.
   const int kParameterMapHeaderSize =
       FixedArray::kHeaderSize + 2 * kPointerSize;
   // If there are no mapped parameters, we do not need the parameter_map.
   Label param_map_size;
-  DCHECK_EQ(static_cast<Smi*>(0), Smi::kZero);
+  DCHECK_EQ(static_cast<Smi*>(0), Smi::FromInt(0));
   __ Branch(USE_DELAY_SLOT, &param_map_size, eq, a6, Operand(zero_reg));
   __ mov(t1, zero_reg);  // In delay slot: param map size = 0 when a6 == 0.
   __ SmiScale(t1, a6, kPointerSizeLog2);
   __ daddiu(t1, t1, kParameterMapHeaderSize);
   __ bind(&param_map_size);
 
   // 2. Backing store.
   __ SmiScale(t2, a5, kPointerSizeLog2);
   __ Daddu(t1, t1, Operand(t2));
   __ Daddu(t1, t1, Operand(FixedArray::kHeaderSize));
@@ skipping 45 matching lines @@
   __ Daddu(a4, v0, Operand(JSSloppyArgumentsObject::kSize));
   __ sd(a4, FieldMemOperand(v0, JSObject::kElementsOffset));
 
   // v0 = address of new object (tagged)
   // a2 = argument count (tagged)
   // a4 = address of parameter map or backing store (tagged)
   // a6 = mapped parameter count (tagged)
   // Initialize parameter map. If there are no mapped arguments, we're done.
   Label skip_parameter_map;
   Label skip3;
-  __ Branch(&skip3, ne, a6, Operand(Smi::kZero));
+  __ Branch(&skip3, ne, a6, Operand(Smi::FromInt(0)));
   // Move backing store address to a1, because it is
   // expected there when filling in the unmapped arguments.
   __ mov(a1, a4);
   __ bind(&skip3);
 
-  __ Branch(&skip_parameter_map, eq, a6, Operand(Smi::kZero));
+  __ Branch(&skip_parameter_map, eq, a6, Operand(Smi::FromInt(0)));
 
   __ LoadRoot(a5, Heap::kSloppyArgumentsElementsMapRootIndex);
   __ sd(a5, FieldMemOperand(a4, FixedArray::kMapOffset));
   __ Daddu(a5, a6, Operand(Smi::FromInt(2)));
   __ sd(a5, FieldMemOperand(a4, FixedArray::kLengthOffset));
   __ sd(cp, FieldMemOperand(a4, FixedArray::kHeaderSize + 0 * kPointerSize));
   __ SmiScale(t2, a6, kPointerSizeLog2);
   __ Daddu(a5, a4, Operand(t2));
   __ Daddu(a5, a5, Operand(kParameterMapHeaderSize));
   __ sd(a5, FieldMemOperand(a4, FixedArray::kHeaderSize + 1 * kPointerSize));
@@ skipping 26 matching lines @@
   __ Dsubu(a5, a5, Operand(Smi::FromInt(1)));
   __ SmiScale(a0, a5, kPointerSizeLog2);
   __ Daddu(a0, a0, Operand(kParameterMapHeaderSize - kHeapObjectTag));
   __ Daddu(t2, a4, a0);
   __ sd(t1, MemOperand(t2));
   __ Dsubu(a0, a0, Operand(kParameterMapHeaderSize - FixedArray::kHeaderSize));
   __ Daddu(t2, a1, a0);
   __ sd(a7, MemOperand(t2));
   __ Daddu(t1, t1, Operand(Smi::FromInt(1)));
   __ bind(&parameters_test);
-  __ Branch(&parameters_loop, ne, a5, Operand(Smi::kZero));
+  __ Branch(&parameters_loop, ne, a5, Operand(Smi::FromInt(0)));
 
   // Restore t1 = argument count (tagged).
   __ ld(a5, FieldMemOperand(v0, JSSloppyArgumentsObject::kLengthOffset));
 
   __ bind(&skip_parameter_map);
   // v0 = address of new object (tagged)
   // a1 = address of backing store (tagged)
   // a5 = argument count (tagged)
   // a6 = mapped parameter count (tagged)
   // t1 = scratch
@@ skipping 526 matching lines @@
   __ ld(scratch, FieldMemOperand(callback, AccessorInfo::kDataOffset));
   __ sd(scratch, MemOperand(sp, (PCA::kDataIndex + 1) * kPointerSize));
   __ LoadRoot(scratch, Heap::kUndefinedValueRootIndex);
   __ sd(scratch, MemOperand(sp, (PCA::kReturnValueOffset + 1) * kPointerSize));
   __ sd(scratch, MemOperand(sp, (PCA::kReturnValueDefaultValueIndex + 1) *
                                     kPointerSize));
   __ li(scratch, Operand(ExternalReference::isolate_address(isolate())));
   __ sd(scratch, MemOperand(sp, (PCA::kIsolateIndex + 1) * kPointerSize));
   __ sd(holder, MemOperand(sp, (PCA::kHolderIndex + 1) * kPointerSize));
   // should_throw_on_error -> false
-  DCHECK(Smi::kZero == nullptr);
+  DCHECK(Smi::FromInt(0) == nullptr);
   __ sd(zero_reg,
         MemOperand(sp, (PCA::kShouldThrowOnErrorIndex + 1) * kPointerSize));
   __ ld(scratch, FieldMemOperand(callback, AccessorInfo::kNameOffset));
   __ sd(scratch, MemOperand(sp, 0 * kPointerSize));
 
   // v8::PropertyCallbackInfo::args_ array and name handle.
   const int kStackUnwindSpace = PropertyCallbackArguments::kArgsLength + 1;
 
   // Load address of v8::PropertyAccessorInfo::args_ array and name handle.
   __ mov(a0, sp);                               // a0 = Handle<Name>
@@ skipping 23 matching lines @@
                            kStackUnwindSpace, kInvalidStackOffset,
                            return_value_operand, NULL);
 }
 
 #undef __
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS64