Index: src/x87/code-stubs-x87.cc |
diff --git a/src/x87/code-stubs-x87.cc b/src/x87/code-stubs-x87.cc |
index 4aa993f54fc73e715656fb36af0a35c926aafcc7..b3f62372f05ae540b7ee1486268ca662ef2496bc 100644 |
--- a/src/x87/code-stubs-x87.cc |
+++ b/src/x87/code-stubs-x87.cc |
@@ -32,14 +32,12 @@ static void InitializeArrayConstructorDescriptor( |
Runtime::kArrayConstructor)->entry; |
if (constant_stack_parameter_count == 0) { |
- CallInterfaceDescriptor* call_descriptor = isolate->call_descriptor( |
- CallDescriptorKey::ArrayConstructorConstantArgCountCall); |
+ ArrayConstructorConstantArgCountDescriptor call_descriptor(isolate); |
descriptor->Initialize(major, call_descriptor, deopt_handler, |
constant_stack_parameter_count, |
JS_FUNCTION_STUB_MODE); |
} else { |
- CallInterfaceDescriptor* call_descriptor = |
- isolate->call_descriptor(CallDescriptorKey::ArrayConstructorCall); |
+ ArrayConstructorDescriptor call_descriptor(isolate); |
descriptor->Initialize(major, call_descriptor, eax, deopt_handler, |
constant_stack_parameter_count, |
JS_FUNCTION_STUB_MODE, PASS_ARGUMENTS); |
@@ -58,14 +56,12 @@ static void InitializeInternalArrayConstructorDescriptor( |
Runtime::kInternalArrayConstructor)->entry; |
if (constant_stack_parameter_count == 0) { |
- CallInterfaceDescriptor* call_descriptor = isolate->call_descriptor( |
- CallDescriptorKey::InternalArrayConstructorConstantArgCountCall); |
+ InternalArrayConstructorConstantArgCountDescriptor call_descriptor(isolate); |
descriptor->Initialize(major, call_descriptor, deopt_handler, |
constant_stack_parameter_count, |
JS_FUNCTION_STUB_MODE); |
} else { |
- CallInterfaceDescriptor* call_descriptor = isolate->call_descriptor( |
- CallDescriptorKey::InternalArrayConstructorCall); |
+ InternalArrayConstructorDescriptor call_descriptor(isolate); |
descriptor->Initialize(major, call_descriptor, eax, deopt_handler, |
constant_stack_parameter_count, |
JS_FUNCTION_STUB_MODE, PASS_ARGUMENTS); |
@@ -338,7 +334,7 @@ void MathPowStub::Generate(MacroAssembler* masm) { |
void FunctionPrototypeStub::Generate(MacroAssembler* masm) { |
Label miss; |
- Register receiver = LoadConvention::ReceiverRegister(); |
+ Register receiver = LoadDescriptor::ReceiverRegister(); |
NamedLoadHandlerCompiler::GenerateLoadFunctionPrototype(masm, receiver, eax, |
ebx, &miss); |
@@ -3888,14 +3884,14 @@ void StubFailureTrampolineStub::Generate(MacroAssembler* masm) { |
void LoadICTrampolineStub::Generate(MacroAssembler* masm) { |
- EmitLoadTypeFeedbackVector(masm, FullVectorLoadConvention::VectorRegister()); |
+ EmitLoadTypeFeedbackVector(masm, VectorLoadICDescriptor::VectorRegister()); |
VectorLoadStub stub(isolate(), state()); |
__ jmp(stub.GetCode(), RelocInfo::CODE_TARGET); |
} |
void KeyedLoadICTrampolineStub::Generate(MacroAssembler* masm) { |
- EmitLoadTypeFeedbackVector(masm, FullVectorLoadConvention::VectorRegister()); |
+ EmitLoadTypeFeedbackVector(masm, VectorLoadICDescriptor::VectorRegister()); |
VectorKeyedLoadStub stub(isolate()); |
__ jmp(stub.GetCode(), RelocInfo::CODE_TARGET); |
} |