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

src/builtins/s390/builtins-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/codegen.h"
 #include "src/debug/debug.h"
 #include "src/deoptimizer.h"
 #include "src/full-codegen/full-codegen.h"
@@ skipping 249 matching lines @@
   }
 
   {
     // Drop all arguments including the receiver.
     __ Drop(r4);
     __ Ret(1);
   }
 
   // 2b. No arguments, return +0.
   __ bind(&no_arguments);
-  __ LoadSmiLiteral(r2, Smi::kZero);
+  __ LoadSmiLiteral(r2, Smi::FromInt(0));
   __ Ret(1);
 }
 
 // static
 void Builtins::Generate_NumberConstructor_ConstructStub(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- r2                     : number of arguments
   //  -- r3                     : constructor function
   //  -- r5                     : new target
   //  -- lr                     : return address
   //  -- sp[(argc - n - 1) * 4] : arg[n] (zero based)
   //  -- sp[argc * 4]           : receiver
   // -----------------------------------
 
   // 1. Make sure we operate in the context of the called function.
   __ LoadP(cp, FieldMemOperand(r3, JSFunction::kContextOffset));
 
   // 2. Load the first argument into r4.
   {
     Label no_arguments, done;
     __ LoadRR(r8, r2);  // Store argc in r8.
     __ CmpP(r2, Operand::Zero());
     __ beq(&no_arguments);
     __ SubP(r2, r2, Operand(1));
     __ ShiftLeftP(r4, r2, Operand(kPointerSizeLog2));
     __ LoadP(r4, MemOperand(sp, r4));
     __ b(&done);
     __ bind(&no_arguments);
-    __ LoadSmiLiteral(r4, Smi::kZero);
+    __ LoadSmiLiteral(r4, Smi::FromInt(0));
     __ bind(&done);
   }
 
   // 3. Make sure r4 is a number.
   {
     Label done_convert;
     __ JumpIfSmi(r4, &done_convert);
     __ CompareObjectType(r4, r6, r6, HEAP_NUMBER_TYPE);
     __ beq(&done_convert);
     {
@@ skipping 1040 matching lines @@
     // Unreachable Code.
     __ bkpt(0);
   }
 }
 
 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));
   __ Move(r4, masm->isolate()->builtins()->InterpreterEntryTrampoline());
   __ AddP(r14, r4, Operand(interpreter_entry_return_pc_offset->value() +
                            Code::kHeaderSize - kHeapObjectTag));
 
   // Initialize the dispatch table register.
   __ mov(kInterpreterDispatchTableRegister,
          Operand(ExternalReference::interpreter_dispatch_table_address(
              masm->isolate())));
 
   // Get the bytecode array pointer from the frame.
@@ skipping 517 matching lines @@
 
   {
     FrameScope scope(masm, StackFrame::INTERNAL);
     // Pass function as argument.
     __ push(r2);
     __ CallRuntime(Runtime::kCompileForOnStackReplacement);
   }
 
   // If the code object is null, just return to the caller.
   Label skip;
-  __ CmpSmiLiteral(r2, Smi::kZero, r0);
+  __ CmpSmiLiteral(r2, Smi::FromInt(0), r0);
   __ bne(&skip);
   __ Ret();
 
   __ bind(&skip);
 
   // Drop any potential handler frame that is be sitting on top of the actual
   // JavaScript frame. This is the case then OSR is triggered from bytecode.
   if (has_handler_frame) {
     __ LeaveFrame(StackFrame::STUB);
   }
@@ skipping 949 matching lines @@
 }
 
 // static
 void Builtins::Generate_AllocateInNewSpace(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- r3 : requested object size (untagged)
   //  -- lr : return address
   // -----------------------------------
   __ SmiTag(r3);
   __ Push(r3);
-  __ LoadSmiLiteral(cp, Smi::kZero);
+  __ LoadSmiLiteral(cp, Smi::FromInt(0));
   __ TailCallRuntime(Runtime::kAllocateInNewSpace);
 }
 
 // static
 void Builtins::Generate_AllocateInOldSpace(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- r3 : requested object size (untagged)
   //  -- lr : return address
   // -----------------------------------
   __ SmiTag(r3);
   __ LoadSmiLiteral(r4, Smi::FromInt(AllocateTargetSpace::encode(OLD_SPACE)));
   __ Push(r3, r4);
-  __ LoadSmiLiteral(cp, Smi::kZero);
+  __ LoadSmiLiteral(cp, Smi::FromInt(0));
   __ TailCallRuntime(Runtime::kAllocateInTargetSpace);
 }
 
 // static
 void Builtins::Generate_Abort(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- r3 : message_id as Smi
   //  -- lr : return address
   // -----------------------------------
   __ push(r3);
-  __ LoadSmiLiteral(cp, Smi::kZero);
+  __ LoadSmiLiteral(cp, Smi::FromInt(0));
   __ TailCallRuntime(Runtime::kAbort);
 }
 
 void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- r2 : actual number of arguments
   //  -- r3 : function (passed through to callee)
   //  -- r4 : expected number of arguments
   //  -- r5 : new target (passed through to callee)
   // -----------------------------------
@@ skipping 120 matching lines @@
     __ bkpt(0);
   }
 }
 
 #undef __
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_S390