Remove uses of result size in TailCallRuntime and friends

src/x64/code-stubs-x64.cc

 // Copyright 2013 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_X64
 
 #include "src/bootstrapper.h"
 #include "src/code-stubs.h"
 #include "src/codegen.h"
 #include "src/ic/handler-compiler.h"
@@ skipping 473 matching lines @@
   // and may not have contained the exponent value in the first place when the
   // input was a smi.  We reset it with exponent value before bailing out.
   __ j(not_equal, &done);
   __ Cvtlsi2sd(double_exponent, exponent);
 
   // Returning or bailing out.
   Counters* counters = isolate()->counters();
   if (exponent_type() == ON_STACK) {
     // The arguments are still on the stack.
     __ bind(&call_runtime);
-    __ TailCallRuntime(Runtime::kMathPowRT, 2, 1);
+    __ TailCallRuntime(Runtime::kMathPowRT, 2);
 
     // The stub is called from non-optimized code, which expects the result
     // as heap number in rax.
     __ bind(&done);
     __ AllocateHeapNumber(rax, rcx, &call_runtime);
     __ Movsd(FieldOperand(rax, HeapNumber::kValueOffset), double_result);
     __ IncrementCounter(counters->math_pow(), 1);
     __ ret(2 * kPointerSize);
   } else {
     __ bind(&call_runtime);
@@ skipping 79 matching lines @@
                                       ARGUMENTS_DONT_CONTAIN_RECEIVER);
   __ movp(rax, adaptor_args.GetArgumentOperand(0));
   __ Ret();
 
   // Slow-case: Handle non-smi or out-of-bounds access to arguments
   // by calling the runtime system.
   __ bind(&slow);
   __ PopReturnAddressTo(rbx);
   __ Push(rdx);
   __ PushReturnAddressFrom(rbx);
-  __ TailCallRuntime(Runtime::kArguments, 1, 1);
+  __ TailCallRuntime(Runtime::kArguments, 1);
 }
 
 
 void ArgumentsAccessStub::GenerateNewSloppyFast(MacroAssembler* masm) {
   // rcx : number of parameters (tagged)
   // rdx : parameters pointer
   // rdi : function
   // rsp[0] : return address
   // Registers used over the whole function:
   //  rbx: the mapped parameter count (untagged)
@@ skipping 191 matching lines @@
 
   // Do the runtime call to allocate the arguments object.
   // r11 = argument count (untagged)
   __ bind(&runtime);
   __ Integer32ToSmi(r11, r11);
   __ PopReturnAddressTo(rax);
   __ Push(rdi);  // Push function.
   __ Push(rdx);  // Push parameters pointer.
   __ Push(r11);  // Push parameter count.
   __ PushReturnAddressFrom(rax);
-  __ TailCallRuntime(Runtime::kNewSloppyArguments, 3, 1);
+  __ TailCallRuntime(Runtime::kNewSloppyArguments, 3);
 }
 
 
 void ArgumentsAccessStub::GenerateNewSloppySlow(MacroAssembler* masm) {
   // rcx : number of parameters (tagged)
   // rdx : parameters pointer
   // rdi : function
   // rsp[0] : return address
 
   DCHECK(rdi.is(ArgumentsAccessNewDescriptor::function()));
@@ skipping 13 matching lines @@
   __ SmiToInteger64(rax, rcx);
   __ leap(rdx, Operand(rbx, rax, times_pointer_size,
                        StandardFrameConstants::kCallerSPOffset));
 
   __ bind(&runtime);
   __ PopReturnAddressTo(rax);
   __ Push(rdi);  // Push function.
   __ Push(rdx);  // Push parameters pointer.
   __ Push(rcx);  // Push parameter count.
   __ PushReturnAddressFrom(rax);
-  __ TailCallRuntime(Runtime::kNewSloppyArguments, 3, 1);
+  __ TailCallRuntime(Runtime::kNewSloppyArguments, 3);
 }
 
 
 void RestParamAccessStub::GenerateNew(MacroAssembler* masm) {
   // rsp[0]  : return address
   // rsp[8]  : language mode
   // rsp[16] : index of rest parameter
   // rsp[24] : number of parameters
   // rsp[32] : receiver displacement
 
   // Check if the calling frame is an arguments adaptor frame.
   Label runtime;
   __ movp(rdx, Operand(rbp, StandardFrameConstants::kCallerFPOffset));
   __ movp(rcx, Operand(rdx, StandardFrameConstants::kContextOffset));
   __ Cmp(rcx, Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
   __ j(not_equal, &runtime);
 
   // Patch the arguments.length and the parameters pointer.
   StackArgumentsAccessor args(rsp, 4, ARGUMENTS_DONT_CONTAIN_RECEIVER);
   __ movp(rcx, Operand(rdx, ArgumentsAdaptorFrameConstants::kLengthOffset));
   __ movp(args.GetArgumentOperand(1), rcx);
   __ SmiToInteger64(rcx, rcx);
   __ leap(rdx, Operand(rdx, rcx, times_pointer_size,
                        StandardFrameConstants::kCallerSPOffset));
   __ movp(args.GetArgumentOperand(0), rdx);
 
   __ bind(&runtime);
-  __ TailCallRuntime(Runtime::kNewRestParam, 4, 1);
+  __ TailCallRuntime(Runtime::kNewRestParam, 4);
 }
 
 
 void LoadIndexedInterceptorStub::Generate(MacroAssembler* masm) {
   // Return address is on the stack.
   Label slow;
 
   Register receiver = LoadDescriptor::ReceiverRegister();
   Register key = LoadDescriptor::NameRegister();
   Register scratch = rax;
   DCHECK(!scratch.is(receiver) && !scratch.is(key));
 
   // Check that the key is an array index, that is Uint32.
   STATIC_ASSERT(kSmiValueSize <= 32);
   __ JumpUnlessNonNegativeSmi(key, &slow);
 
   // Everything is fine, call runtime.
   __ PopReturnAddressTo(scratch);
   __ Push(receiver);  // receiver
   __ Push(key);       // key
   __ PushReturnAddressFrom(scratch);
 
   // Perform tail call to the entry.
-  __ TailCallRuntime(Runtime::kLoadElementWithInterceptor, 2, 1);
+  __ TailCallRuntime(Runtime::kLoadElementWithInterceptor, 2);
 
   __ bind(&slow);
   PropertyAccessCompiler::TailCallBuiltin(
       masm, PropertyAccessCompiler::MissBuiltin(Code::KEYED_LOAD_IC));
 }
 
 
 void LoadIndexedStringStub::Generate(MacroAssembler* masm) {
   // Return address is on the stack.
   Label miss;
@@ skipping 113 matching lines @@
   __ bind(&done);
   __ ret(0);
 
   // Do the runtime call to allocate the arguments object.
   __ bind(&runtime);
   __ PopReturnAddressTo(rax);
   __ Push(rdi);  // Push function.
   __ Push(rdx);  // Push parameters pointer.
   __ Push(rcx);  // Push parameter count.
   __ PushReturnAddressFrom(rax);
-  __ TailCallRuntime(Runtime::kNewStrictArguments, 3, 1);
+  __ TailCallRuntime(Runtime::kNewStrictArguments, 3);
 }
 
 
 void RegExpExecStub::Generate(MacroAssembler* masm) {
   // Just jump directly to runtime if native RegExp is not selected at compile
   // time or if regexp entry in generated code is turned off runtime switch or
   // at compilation.
 #ifdef V8_INTERPRETED_REGEXP
-  __ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
+  __ TailCallRuntime(Runtime::kRegExpExec, 4);
 #else  // V8_INTERPRETED_REGEXP
 
   // Stack frame on entry.
   //  rsp[0]  : return address
   //  rsp[8]  : last_match_info (expected JSArray)
   //  rsp[16] : previous index
   //  rsp[24] : subject string
   //  rsp[32] : JSRegExp object
 
   enum RegExpExecStubArgumentIndices {
@@ skipping 362 matching lines @@
   ExternalReference pending_exception_address(
       Isolate::kPendingExceptionAddress, isolate());
   Operand pending_exception_operand =
       masm->ExternalOperand(pending_exception_address, rbx);
   __ movp(rax, pending_exception_operand);
   __ LoadRoot(rdx, Heap::kTheHoleValueRootIndex);
   __ cmpp(rax, rdx);
   __ j(equal, &runtime);
 
   // For exception, throw the exception again.
-  __ TailCallRuntime(Runtime::kRegExpExecReThrow, 4, 1);
+  __ TailCallRuntime(Runtime::kRegExpExecReThrow, 4);
 
   // Do the runtime call to execute the regexp.
   __ bind(&runtime);
-  __ TailCallRuntime(Runtime::kRegExpExec, 4, 1);
+  __ TailCallRuntime(Runtime::kRegExpExec, 4);
 
   // Deferred code for string handling.
   // (7) Not a long external string?  If yes, go to (10).
   __ bind(&not_seq_nor_cons);
   // Compare flags are still set from (3).
   __ j(greater, &not_long_external, Label::kNear);  // Go to (10).
 
   // (8) External string.  Short external strings have been ruled out.
   __ bind(&external_string);
   __ movp(rbx, FieldOperand(rdi, HeapObject::kMapOffset));
@@ skipping 323 matching lines @@
   __ bind(&runtime_call);
 
   // Push arguments below the return address to prepare jump to builtin.
   __ PopReturnAddressTo(rcx);
   __ Push(rdx);
   __ Push(rax);
 
   // Figure out which native to call and setup the arguments.
   if (cc == equal) {
     __ PushReturnAddressFrom(rcx);
-    __ TailCallRuntime(strict() ? Runtime::kStrictEquals : Runtime::kEquals, 2,
-                       1);
+    __ TailCallRuntime(strict() ? Runtime::kStrictEquals : Runtime::kEquals, 2);
   } else {
     __ Push(Smi::FromInt(NegativeComparisonResult(cc)));
     __ PushReturnAddressFrom(rcx);
     __ TailCallRuntime(
-        is_strong(strength()) ? Runtime::kCompare_Strong : Runtime::kCompare, 3,
-        1);
+        is_strong(strength()) ? Runtime::kCompare_Strong : Runtime::kCompare,
+        3);
   }
 
   __ bind(&miss);
   GenerateMiss(masm);
 }
 
 
 static void CallStubInRecordCallTarget(MacroAssembler* masm, CodeStub* stub) {
   // rax : number of arguments to the construct function
   // rbx : feedback vector
@@ skipping 775 matching lines @@
 
   // Found Proxy or access check needed: Call the runtime.
   __ bind(&fast_runtime_fallback);
   __ PopReturnAddressTo(kScratchRegister);
   __ Push(object);
   __ Push(function_prototype);
   __ PushReturnAddressFrom(kScratchRegister);
   // Invalidate the instanceof cache.
   __ Move(rax, Smi::FromInt(0));
   __ StoreRoot(rax, Heap::kInstanceofCacheFunctionRootIndex);
-  __ TailCallRuntime(Runtime::kHasInPrototypeChain, 2, 1);
+  __ TailCallRuntime(Runtime::kHasInPrototypeChain, 2);
 
   // Slow-case: Call the %InstanceOf runtime function.
   __ bind(&slow_case);
   __ PopReturnAddressTo(kScratchRegister);
   __ Push(object);
   __ Push(function);
   __ PushReturnAddressFrom(kScratchRegister);
-  __ TailCallRuntime(Runtime::kInstanceOf, 2, 1);
+  __ TailCallRuntime(Runtime::kInstanceOf, 2);
 }
 
 
 // -------------------------------------------------------------------------
 // StringCharCodeAtGenerator
 
 void StringCharCodeAtGenerator::GenerateFast(MacroAssembler* masm) {
   // If the receiver is a smi trigger the non-string case.
   if (check_mode_ == RECEIVER_IS_UNKNOWN) {
     __ JumpIfSmi(object_, receiver_not_string_);
@@ skipping 356 matching lines @@
   // rcx: result length
   // rdi: first character of result
   // r14: character of sub string start
   StringHelper::GenerateCopyCharacters(
       masm, rdi, r14, rcx, String::TWO_BYTE_ENCODING);
   __ IncrementCounter(counters->sub_string_native(), 1);
   __ ret(SUB_STRING_ARGUMENT_COUNT * kPointerSize);
 
   // Just jump to runtime to create the sub string.
   __ bind(&runtime);
-  __ TailCallRuntime(Runtime::kSubString, 3, 1);
+  __ TailCallRuntime(Runtime::kSubString, 3);
 
   __ bind(&single_char);
   // rax: string
   // rbx: instance type
   // rcx: sub string length (smi)
   // rdx: from index (smi)
   StringCharAtGenerator generator(rax, rdx, rcx, rax, &runtime, &runtime,
                                   &runtime, STRING_INDEX_IS_NUMBER,
                                   RECEIVER_IS_STRING);
   generator.GenerateFast(masm);
@@ skipping 25 matching lines @@
   __ testl(FieldOperand(rax, String::kHashFieldOffset),
            Immediate(String::kContainsCachedArrayIndexMask));
   __ j(not_zero, &slow_string, Label::kNear);
   __ movl(rax, FieldOperand(rax, String::kHashFieldOffset));
   __ IndexFromHash(rax, rax);
   __ Ret();
   __ bind(&slow_string);
   __ PopReturnAddressTo(rcx);     // Pop return address.
   __ Push(rax);                   // Push argument.
   __ PushReturnAddressFrom(rcx);  // Push return address.
-  __ TailCallRuntime(Runtime::kStringToNumber, 1, 1);
+  __ TailCallRuntime(Runtime::kStringToNumber, 1);
   __ bind(&not_string);
 
   Label not_oddball;
   __ CmpInstanceType(rdi, ODDBALL_TYPE);
   __ j(not_equal, &not_oddball, Label::kNear);
   __ movp(rax, FieldOperand(rax, Oddball::kToNumberOffset));
   __ Ret();
   __ bind(&not_oddball);
 
   __ PopReturnAddressTo(rcx);     // Pop return address.
   __ Push(rax);                   // Push argument.
   __ PushReturnAddressFrom(rcx);  // Push return address.
-  __ TailCallRuntime(Runtime::kToNumber, 1, 1);
+  __ TailCallRuntime(Runtime::kToNumber, 1);
 }
 
 
 void ToLengthStub::Generate(MacroAssembler* masm) {
   // The ToLength stub takes on argument in rax.
   Label not_smi, positive_smi;
   __ JumpIfNotSmi(rax, &not_smi, Label::kNear);
   STATIC_ASSERT(kSmiTag == 0);
   __ testp(rax, rax);
   __ j(greater_equal, &positive_smi, Label::kNear);
   __ xorl(rax, rax);
   __ bind(&positive_smi);
   __ Ret();
   __ bind(&not_smi);
 
   __ PopReturnAddressTo(rcx);     // Pop return address.
   __ Push(rax);                   // Push argument.
   __ PushReturnAddressFrom(rcx);  // Push return address.
-  __ TailCallRuntime(Runtime::kToLength, 1, 1);
+  __ TailCallRuntime(Runtime::kToLength, 1);
 }
 
 
 void ToStringStub::Generate(MacroAssembler* masm) {
   // The ToString stub takes one argument in rax.
   Label is_number;
   __ JumpIfSmi(rax, &is_number, Label::kNear);
 
   Label not_string;
   __ CmpObjectType(rax, FIRST_NONSTRING_TYPE, rdi);
@@ skipping 14 matching lines @@
   Label not_oddball;
   __ CmpInstanceType(rdi, ODDBALL_TYPE);
   __ j(not_equal, &not_oddball, Label::kNear);
   __ movp(rax, FieldOperand(rax, Oddball::kToStringOffset));
   __ Ret();
   __ bind(&not_oddball);
 
   __ PopReturnAddressTo(rcx);     // Pop return address.
   __ Push(rax);                   // Push argument.
   __ PushReturnAddressFrom(rcx);  // Push return address.
-  __ TailCallRuntime(Runtime::kToString, 1, 1);
+  __ TailCallRuntime(Runtime::kToString, 1);
 }
 
 
 void StringHelper::GenerateFlatOneByteStringEquals(MacroAssembler* masm,
                                                    Register left,
                                                    Register right,
                                                    Register scratch1,
                                                    Register scratch2) {
   Register length = scratch1;
 
@@ skipping 154 matching lines @@
   StringHelper::GenerateCompareFlatOneByteStrings(masm, rdx, rax, rcx, rbx, rdi,
                                                   r8);
 
   // Call the runtime; it returns -1 (less), 0 (equal), or 1 (greater)
   // tagged as a small integer.
   __ bind(&runtime);
   __ PopReturnAddressTo(rcx);
   __ Push(rdx);
   __ Push(rax);
   __ PushReturnAddressFrom(rcx);
-  __ TailCallRuntime(Runtime::kStringCompare, 2, 1);
+  __ TailCallRuntime(Runtime::kStringCompare, 2);
 }
 
 
 void BinaryOpICWithAllocationSiteStub::Generate(MacroAssembler* masm) {
   // ----------- S t a t e -------------
   //  -- rdx    : left
   //  -- rax    : right
   //  -- rsp[0] : return address
   // -----------------------------------
 
@@ skipping 24 matching lines @@
   Label::Distance const miss_distance =
       masm->emit_debug_code() ? Label::kFar : Label::kNear;
 
   __ JumpIfSmi(rdx, &miss, miss_distance);
   __ movp(rcx, FieldOperand(rdx, HeapObject::kMapOffset));
   __ JumpIfSmi(rax, &miss, miss_distance);
   __ movp(rbx, FieldOperand(rax, HeapObject::kMapOffset));
   __ JumpIfNotRoot(rcx, Heap::kBooleanMapRootIndex, &miss, miss_distance);
   __ JumpIfNotRoot(rbx, Heap::kBooleanMapRootIndex, &miss, miss_distance);
   if (op() != Token::EQ_STRICT && is_strong(strength())) {
-    __ TailCallRuntime(Runtime::kThrowStrongModeImplicitConversion, 0, 1);
+    __ TailCallRuntime(Runtime::kThrowStrongModeImplicitConversion, 0);
   } else {
     if (!Token::IsEqualityOp(op())) {
       __ movp(rax, FieldOperand(rax, Oddball::kToNumberOffset));
       __ AssertSmi(rax);
       __ movp(rdx, FieldOperand(rdx, Oddball::kToNumberOffset));
       __ AssertSmi(rdx);
       __ xchgp(rax, rdx);
     }
     __ subp(rax, rdx);
     __ Ret();
@@ skipping 261 matching lines @@
         masm, left, right, tmp1, tmp2, tmp3, kScratchRegister);
   }
 
   // Handle more complex cases in runtime.
   __ bind(&runtime);
   __ PopReturnAddressTo(tmp1);
   __ Push(left);
   __ Push(right);
   __ PushReturnAddressFrom(tmp1);
   if (equality) {
-    __ TailCallRuntime(Runtime::kStringEquals, 2, 1);
+    __ TailCallRuntime(Runtime::kStringEquals, 2);
   } else {
-    __ TailCallRuntime(Runtime::kStringCompare, 2, 1);
+    __ TailCallRuntime(Runtime::kStringCompare, 2);
   }
 
   __ bind(&miss);
   GenerateMiss(masm);
 }
 
 
 void CompareICStub::GenerateReceivers(MacroAssembler* masm) {
   DCHECK_EQ(CompareICState::RECEIVER, state());
   Label miss;
@@ skipping 24 matching lines @@
   __ GetWeakValue(rdi, cell);
   __ cmpp(FieldOperand(rdx, HeapObject::kMapOffset), rdi);
   __ j(not_equal, &miss, Label::kNear);
   __ cmpp(FieldOperand(rax, HeapObject::kMapOffset), rdi);
   __ j(not_equal, &miss, Label::kNear);
 
   if (Token::IsEqualityOp(op())) {
     __ subp(rax, rdx);
     __ ret(0);
   } else if (is_strong(strength())) {
-    __ TailCallRuntime(Runtime::kThrowStrongModeImplicitConversion, 0, 1);
+    __ TailCallRuntime(Runtime::kThrowStrongModeImplicitConversion, 0);
   } else {
     __ PopReturnAddressTo(rcx);
     __ Push(rdx);
     __ Push(rax);
     __ Push(Smi::FromInt(NegativeComparisonResult(GetCondition())));
     __ PushReturnAddressFrom(rcx);
-    __ TailCallRuntime(Runtime::kCompare, 3, 1);
+    __ TailCallRuntime(Runtime::kCompare, 3);
   }
 
   __ bind(&miss);
   GenerateMiss(masm);
 }
 
 
 void CompareICStub::GenerateMiss(MacroAssembler* masm) {
   {
     // Call the runtime system in a fresh internal frame.
@@ skipping 1132 matching lines @@
       StackArgumentsAccessor args(rsp, 1);
       __ movp(args.GetReceiverOperand(), rdi);
       __ Set(rax, 4);
       break;
     }
   }
   __ PopReturnAddressTo(rcx);
   __ Push(rdx);
   __ Push(rbx);
   __ PushReturnAddressFrom(rcx);
-  __ JumpToExternalReference(ExternalReference(Runtime::kNewArray, isolate()),
-                             1);
+  __ JumpToExternalReference(ExternalReference(Runtime::kNewArray, isolate()));
 }
 
 
 void InternalArrayConstructorStub::GenerateCase(
     MacroAssembler* masm, ElementsKind kind) {
   Label not_zero_case, not_one_case;
   Label normal_sequence;
 
   __ testp(rax, rax);
   __ j(not_zero, &not_zero_case);
@@ skipping 98 matching lines @@
   __ CompareRoot(result_reg, Heap::kTheHoleValueRootIndex);
   __ j(equal, &slow_case, Label::kNear);
   __ Ret();
 
   // Fallback to the runtime.
   __ bind(&slow_case);
   __ Integer32ToSmi(slot_reg, slot_reg);
   __ PopReturnAddressTo(kScratchRegister);
   __ Push(slot_reg);
   __ Push(kScratchRegister);
-  __ TailCallRuntime(Runtime::kLoadGlobalViaContext, 1, 1);
+  __ TailCallRuntime(Runtime::kLoadGlobalViaContext, 1);
 }
 
 
 void StoreGlobalViaContextStub::Generate(MacroAssembler* masm) {
   Register context_reg = rsi;
   Register slot_reg = rbx;
   Register value_reg = rax;
   Register cell_reg = r8;
   Register cell_details_reg = rdx;
   Register cell_value_reg = r9;
@@ skipping 103 matching lines @@
   // Fallback to the runtime.
   __ bind(&slow_case);
   __ Integer32ToSmi(slot_reg, slot_reg);
   __ PopReturnAddressTo(kScratchRegister);
   __ Push(slot_reg);
   __ Push(value_reg);
   __ Push(kScratchRegister);
   __ TailCallRuntime(is_strict(language_mode())
                          ? Runtime::kStoreGlobalViaContext_Strict
                          : Runtime::kStoreGlobalViaContext_Sloppy,
-                     2, 1);
+                     2);
 }
 
 
 static int Offset(ExternalReference ref0, ExternalReference ref1) {
   int64_t offset = (ref0.address() - ref1.address());
   // Check that fits into int.
   DCHECK(static_cast<int>(offset) == offset);
   return static_cast<int>(offset);
 }
 
@@ skipping 153 matching lines @@
     DCHECK_EQ(stack_space, 0);
     __ PopReturnAddressTo(rcx);
     __ addq(rsp, rbx);
     __ jmp(rcx);
   } else {
     __ ret(stack_space * kPointerSize);
   }
 
   // Re-throw by promoting a scheduled exception.
   __ bind(&promote_scheduled_exception);
-  __ TailCallRuntime(Runtime::kPromoteScheduledException, 0, 1);
+  __ TailCallRuntime(Runtime::kPromoteScheduledException, 0);
 
   // HandleScope limit has changed. Delete allocated extensions.
   __ bind(&delete_allocated_handles);
   __ movp(Operand(base_reg, kLimitOffset), prev_limit_reg);
   __ movp(prev_limit_reg, rax);
   __ LoadAddress(arg_reg_1, ExternalReference::isolate_address(isolate));
   __ LoadAddress(rax,
                  ExternalReference::delete_handle_scope_extensions(isolate));
   __ call(rax);
   __ movp(rax, prev_limit_reg);
@@ skipping 211 matching lines @@
                            kStackSpace, nullptr, return_value_operand, NULL);
 }
 
 
 #undef __
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X64