Index: src/arm/code-stubs-arm.cc |
diff --git a/src/arm/code-stubs-arm.cc b/src/arm/code-stubs-arm.cc |
index 8cdf6b995beeb0d55d70e113a846e12bccf93dfa..fd11f3321bd183d2dd803977e5eca8dcb3f507fa 100644 |
--- a/src/arm/code-stubs-arm.cc |
+++ b/src/arm/code-stubs-arm.cc |
@@ -27,14 +27,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, r0, deopt_handler, |
constant_stack_parameter_count, |
JS_FUNCTION_STUB_MODE, PASS_ARGUMENTS); |
@@ -50,14 +48,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, r0, deopt_handler, |
constant_stack_parameter_count, |
JS_FUNCTION_STUB_MODE, PASS_ARGUMENTS); |
@@ -1624,7 +1620,7 @@ void InstanceofStub::Generate(MacroAssembler* masm) { |
void FunctionPrototypeStub::Generate(MacroAssembler* masm) { |
Label miss; |
- Register receiver = LoadConvention::ReceiverRegister(); |
+ Register receiver = LoadDescriptor::ReceiverRegister(); |
NamedLoadHandlerCompiler::GenerateLoadFunctionPrototype(masm, receiver, r3, |
r4, &miss); |
@@ -4336,14 +4332,14 @@ void StubFailureTrampolineStub::Generate(MacroAssembler* masm) { |
void LoadICTrampolineStub::Generate(MacroAssembler* masm) { |
- EmitLoadTypeFeedbackVector(masm, FullVectorLoadConvention::VectorRegister()); |
+ EmitLoadTypeFeedbackVector(masm, VectorLoadICDescriptor::VectorRegister()); |
VectorLoadStub stub(isolate(), state()); |
__ Jump(stub.GetCode(), RelocInfo::CODE_TARGET); |
} |
void KeyedLoadICTrampolineStub::Generate(MacroAssembler* masm) { |
- EmitLoadTypeFeedbackVector(masm, FullVectorLoadConvention::VectorRegister()); |
+ EmitLoadTypeFeedbackVector(masm, VectorLoadICDescriptor::VectorRegister()); |
VectorKeyedLoadStub stub(isolate()); |
__ Jump(stub.GetCode(), RelocInfo::CODE_TARGET); |
} |