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

src/builtins/x87/builtins-x87.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_X87
 
 #include "src/code-factory.h"
 #include "src/codegen.h"
 #include "src/deoptimizer.h"
 #include "src/full-codegen/full-codegen.h"
@@ skipping 456 matching lines @@
     __ PushReturnAddressFrom(eax);  // Return address.
     __ Push(ebp);                   // Caller's frame pointer.
     __ Move(ebp, esp);
     __ Push(esi);  // Callee's context.
     __ Push(edi);  // Callee's JS Function.
 
     // Restore the operand stack.
     __ mov(eax, FieldOperand(ebx, JSGeneratorObject::kOperandStackOffset));
     {
       Label done_loop, loop;
-      __ Move(ecx, Smi::kZero);
+      __ Move(ecx, Smi::FromInt(0));
       __ bind(&loop);
       __ cmp(ecx, FieldOperand(eax, FixedArray::kLengthOffset));
       __ j(equal, &done_loop, Label::kNear);
       __ Push(FieldOperand(eax, ecx, times_half_pointer_size,
                            FixedArray::kHeaderSize));
       __ add(ecx, Immediate(Smi::FromInt(1)));
       __ jmp(&loop);
       __ bind(&done_loop);
     }
 
@@ skipping 516 matching lines @@
     // This should be unreachable.
     __ int3();
   }
 }
 
 void Builtins::Generate_InterpreterEnterBytecodeDispatch(MacroAssembler* masm) {
   // Set the return address to the correct point in the interpreter entry
   // trampoline.
   Smi* interpreter_entry_return_pc_offset(
       masm->isolate()->heap()->interpreter_entry_return_pc_offset());
-  DCHECK_NE(interpreter_entry_return_pc_offset, Smi::kZero);
+  DCHECK_NE(interpreter_entry_return_pc_offset, Smi::FromInt(0));
   __ LoadHeapObject(ebx,
                     masm->isolate()->builtins()->InterpreterEntryTrampoline());
   __ add(ebx, Immediate(interpreter_entry_return_pc_offset->value() +
                         Code::kHeaderSize - kHeapObjectTag));
   __ push(ebx);
 
   // Initialize the dispatch table register.
   __ mov(kInterpreterDispatchTableRegister,
          Immediate(ExternalReference::interpreter_dispatch_table_address(
              masm->isolate())));
@@ skipping 924 matching lines @@
   __ SmiTag(ecx);
 
   // 2. Load the first argument into ebx.
   {
     Label no_arguments, done;
     __ test(eax, eax);
     __ j(zero, &no_arguments, Label::kNear);
     __ mov(ebx, Operand(esp, eax, times_pointer_size, 0));
     __ jmp(&done, Label::kNear);
     __ bind(&no_arguments);
-    __ Move(ebx, Smi::kZero);
+    __ Move(ebx, Smi::FromInt(0));
     __ bind(&done);
   }
 
   // 3. Make sure ebx is a number.
   {
     Label done_convert;
     __ JumpIfSmi(ebx, &done_convert);
     __ CompareRoot(FieldOperand(ebx, HeapObject::kMapOffset),
                    Heap::kHeapNumberMapRootIndex);
     __ j(equal, &done_convert);
@@ skipping 884 matching lines @@
 // static
 void Builtins::Generate_AllocateInNewSpace(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- edx    : requested object size (untagged)
   //  -- esp[0] : return address
   // -----------------------------------
   __ SmiTag(edx);
   __ PopReturnAddressTo(ecx);
   __ Push(edx);
   __ PushReturnAddressFrom(ecx);
-  __ Move(esi, Smi::kZero);
+  __ Move(esi, Smi::FromInt(0));
   __ TailCallRuntime(Runtime::kAllocateInNewSpace);
 }
 
 // static
 void Builtins::Generate_AllocateInOldSpace(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- edx    : requested object size (untagged)
   //  -- esp[0] : return address
   // -----------------------------------
   __ SmiTag(edx);
   __ PopReturnAddressTo(ecx);
   __ Push(edx);
   __ Push(Smi::FromInt(AllocateTargetSpace::encode(OLD_SPACE)));
   __ PushReturnAddressFrom(ecx);
-  __ Move(esi, Smi::kZero);
+  __ Move(esi, Smi::FromInt(0));
   __ TailCallRuntime(Runtime::kAllocateInTargetSpace);
 }
 
 // static
 void Builtins::Generate_Abort(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- edx    : message_id as Smi
   //  -- esp[0] : return address
   // -----------------------------------
   __ PopReturnAddressTo(ecx);
   __ Push(edx);
   __ PushReturnAddressFrom(ecx);
-  __ Move(esi, Smi::kZero);
+  __ Move(esi, Smi::FromInt(0));
   __ TailCallRuntime(Runtime::kAbort);
 }
 
 void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- eax : actual number of arguments
   //  -- ebx : expected number of arguments
   //  -- edx : new target (passed through to callee)
   //  -- edi : function (passed through to callee)
   // -----------------------------------
@@ skipping 263 matching lines @@
 
 void Builtins::Generate_InterpreterOnStackReplacement(MacroAssembler* masm) {
   Generate_OnStackReplacementHelper(masm, true);
 }
 
 #undef __
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X87