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

src/s390/code-stubs-s390.cc

 // Copyright 2014 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_S390
 
 #include "src/code-stubs.h"
 #include "src/api-arguments.h"
 #include "src/base/bits.h"
 #include "src/bootstrapper.h"
@@ skipping 535 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));
   __ AndP(r4, lhs, rhs);
   __ JumpIfNotSmi(r4, &not_smis);
   // 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 lhs_not_nan.
   // In cases 3 and 4 we have found out we were dealing with a number-number
   // comparison.  The double values of the numbers have been loaded
   // into d7 and d6.
@@ skipping 3741 matching lines @@
   __ LoadRR(r8, r7);
   __ bind(&skip);
 
   __ 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.
-  __ CmpSmiLiteral(r8, Smi::kZero, r0);
+  __ CmpSmiLiteral(r8, Smi::FromInt(0), r0);
   Label skip2, skip3;
   __ bne(&skip2);
   __ LoadImmP(r1, Operand::Zero());
   __ b(&skip3);
   __ bind(&skip2);
   __ SmiToPtrArrayOffset(r1, r8);
   __ AddP(r1, r1, Operand(kParameterMapHeaderSize));
   __ bind(&skip3);
 
   // 2. Backing store.
@@ skipping 49 matching lines @@
   // it will point to the backing store.
   __ AddP(r6, r2, Operand(JSSloppyArgumentsObject::kSize));
   __ StoreP(r6, FieldMemOperand(r2, JSObject::kElementsOffset), r0);
 
   // r2 = address of new object (tagged)
   // r4 = argument count (tagged)
   // r6 = address of parameter map or backing store (tagged)
   // r8 = mapped parameter count (tagged)
   // Initialize parameter map. If there are no mapped arguments, we're done.
   Label skip_parameter_map;
-  __ CmpSmiLiteral(r8, Smi::kZero, r0);
+  __ CmpSmiLiteral(r8, Smi::FromInt(0), r0);
   Label skip6;
   __ bne(&skip6);
   // Move backing store address to r3, because it is
   // expected there when filling in the unmapped arguments.
   __ LoadRR(r3, r6);
   __ b(&skip_parameter_map);
   __ bind(&skip6);
 
   __ LoadRoot(r7, Heap::kSloppyArgumentsElementsMapRootIndex);
   __ StoreP(r7, FieldMemOperand(r6, FixedArray::kMapOffset), r0);
@@ skipping 616 matching lines @@
   Register api_function_address = r4;
 
   __ push(receiver);
   // Push data from AccessorInfo.
   __ LoadP(scratch, FieldMemOperand(callback, AccessorInfo::kDataOffset));
   __ push(scratch);
   __ LoadRoot(scratch, Heap::kUndefinedValueRootIndex);
   __ Push(scratch, scratch);
   __ mov(scratch, Operand(ExternalReference::isolate_address(isolate())));
   __ Push(scratch, holder);
-  __ Push(Smi::kZero);  // should_throw_on_error -> false
+  __ Push(Smi::FromInt(0));  // should_throw_on_error -> false
   __ LoadP(scratch, FieldMemOperand(callback, AccessorInfo::kNameOffset));
   __ push(scratch);
 
   // v8::PropertyCallbackInfo::args_ array and name handle.
   const int kStackUnwindSpace = PropertyCallbackArguments::kArgsLength + 1;
 
   // Load address of v8::PropertyAccessorInfo::args_ array and name handle.
   __ LoadRR(r2, sp);                           // r2 = Handle<Name>
   __ AddP(r3, r2, Operand(1 * kPointerSize));  // r3 = v8::PCI::args_
 
@@ skipping 46 matching lines @@
   CallApiFunctionAndReturn(masm, api_function_address, thunk_ref,
                            kStackUnwindSpace, NULL, return_value_operand, NULL);
 }
 
 #undef __
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_S390