| Index: src/x64/code-stubs-x64.cc
|
| diff --git a/src/x64/code-stubs-x64.cc b/src/x64/code-stubs-x64.cc
|
| index 55eede68930bdb0772d66f1f489a3308394662c7..14dcb2e89c356619ff1dc3a4880ba254d7038570 100644
|
| --- a/src/x64/code-stubs-x64.cc
|
| +++ b/src/x64/code-stubs-x64.cc
|
| @@ -529,7 +529,7 @@ void MathPowStub::Generate(MacroAssembler* masm) {
|
| __ movp(scratch, Immediate(1));
|
| __ Cvtlsi2sd(double_result, scratch);
|
|
|
| - if (exponent_type_ == ON_STACK) {
|
| + if (exponent_type() == ON_STACK) {
|
| Label base_is_smi, unpack_exponent;
|
| // The exponent and base are supplied as arguments on the stack.
|
| // This can only happen if the stub is called from non-optimized code.
|
| @@ -559,7 +559,7 @@ void MathPowStub::Generate(MacroAssembler* masm) {
|
| Heap::kHeapNumberMapRootIndex);
|
| __ j(not_equal, &call_runtime);
|
| __ movsd(double_exponent, FieldOperand(exponent, HeapNumber::kValueOffset));
|
| - } else if (exponent_type_ == TAGGED) {
|
| + } else if (exponent_type() == TAGGED) {
|
| __ JumpIfNotSmi(exponent, &exponent_not_smi, Label::kNear);
|
| __ SmiToInteger32(exponent, exponent);
|
| __ jmp(&int_exponent);
|
| @@ -568,7 +568,7 @@ void MathPowStub::Generate(MacroAssembler* masm) {
|
| __ movsd(double_exponent, FieldOperand(exponent, HeapNumber::kValueOffset));
|
| }
|
|
|
| - if (exponent_type_ != INTEGER) {
|
| + if (exponent_type() != INTEGER) {
|
| Label fast_power, try_arithmetic_simplification;
|
| // Detect integer exponents stored as double.
|
| __ DoubleToI(exponent, double_exponent, double_scratch,
|
| @@ -581,7 +581,7 @@ void MathPowStub::Generate(MacroAssembler* masm) {
|
| __ cmpl(exponent, Immediate(0x1));
|
| __ j(overflow, &call_runtime);
|
|
|
| - if (exponent_type_ == ON_STACK) {
|
| + if (exponent_type() == ON_STACK) {
|
| // Detect square root case. Crankshaft detects constant +/-0.5 at
|
| // compile time and uses DoMathPowHalf instead. We then skip this check
|
| // for non-constant cases of +/-0.5 as these hardly occur.
|
| @@ -740,7 +740,7 @@ void MathPowStub::Generate(MacroAssembler* masm) {
|
|
|
| // Returning or bailing out.
|
| Counters* counters = isolate()->counters();
|
| - if (exponent_type_ == ON_STACK) {
|
| + if (exponent_type() == ON_STACK) {
|
| // The arguments are still on the stack.
|
| __ bind(&call_runtime);
|
| __ TailCallRuntime(Runtime::kMathPowRT, 2, 1);
|
| @@ -2166,7 +2166,7 @@ static void CallFunctionNoFeedback(MacroAssembler* masm,
|
|
|
|
|
| void CallFunctionStub::Generate(MacroAssembler* masm) {
|
| - CallFunctionNoFeedback(masm, argc_, NeedsChecks(), CallAsMethod());
|
| + CallFunctionNoFeedback(masm, argc(), NeedsChecks(), CallAsMethod());
|
| }
|
|
|
|
|
| @@ -4433,9 +4433,8 @@ void StubFailureTrampolineStub::Generate(MacroAssembler* masm) {
|
| __ movp(rbx, MemOperand(rbp, parameter_count_offset));
|
| masm->LeaveFrame(StackFrame::STUB_FAILURE_TRAMPOLINE);
|
| __ PopReturnAddressTo(rcx);
|
| - int additional_offset = function_mode_ == JS_FUNCTION_STUB_MODE
|
| - ? kPointerSize
|
| - : 0;
|
| + int additional_offset =
|
| + function_mode() == JS_FUNCTION_STUB_MODE ? kPointerSize : 0;
|
| __ leap(rsp, MemOperand(rsp, rbx, times_pointer_size, additional_offset));
|
| __ jmp(rcx); // Return to IC Miss stub, continuation still on stack.
|
| }
|
| @@ -4643,7 +4642,7 @@ void InternalArrayConstructorStubBase::GenerateStubsAheadOfTime(
|
| void ArrayConstructorStub::GenerateDispatchToArrayStub(
|
| MacroAssembler* masm,
|
| AllocationSiteOverrideMode mode) {
|
| - if (argument_count_ == ANY) {
|
| + if (argument_count() == ANY) {
|
| Label not_zero_case, not_one_case;
|
| __ testp(rax, rax);
|
| __ j(not_zero, ¬_zero_case);
|
| @@ -4656,11 +4655,11 @@ void ArrayConstructorStub::GenerateDispatchToArrayStub(
|
|
|
| __ bind(¬_one_case);
|
| CreateArrayDispatch<ArrayNArgumentsConstructorStub>(masm, mode);
|
| - } else if (argument_count_ == NONE) {
|
| + } else if (argument_count() == NONE) {
|
| CreateArrayDispatch<ArrayNoArgumentConstructorStub>(masm, mode);
|
| - } else if (argument_count_ == ONE) {
|
| + } else if (argument_count() == ONE) {
|
| CreateArrayDispatchOneArgument(masm, mode);
|
| - } else if (argument_count_ == MORE_THAN_ONE) {
|
| + } else if (argument_count() == MORE_THAN_ONE) {
|
| CreateArrayDispatch<ArrayNArgumentsConstructorStub>(masm, mode);
|
| } else {
|
| UNREACHABLE();
|
| @@ -4821,9 +4820,9 @@ void CallApiFunctionStub::Generate(MacroAssembler* masm) {
|
| Register return_address = rdi;
|
| Register context = rsi;
|
|
|
| - int argc = ArgumentBits::decode(bit_field_);
|
| - bool is_store = IsStoreBits::decode(bit_field_);
|
| - bool call_data_undefined = CallDataUndefinedBits::decode(bit_field_);
|
| + int argc = this->argc();
|
| + bool is_store = this->is_store();
|
| + bool call_data_undefined = this->call_data_undefined();
|
|
|
| typedef FunctionCallbackArguments FCA;
|
|
|
|
|