Index: src/ia32/code-stubs-ia32.cc |
diff --git a/src/ia32/code-stubs-ia32.cc b/src/ia32/code-stubs-ia32.cc |
index 18dc9e1dddb7815cf0ca12a87453ff7ae4fb48de..e3301df9f664226ebbf93edb105f4be93515406f 100644 |
--- a/src/ia32/code-stubs-ia32.cc |
+++ b/src/ia32/code-stubs-ia32.cc |
@@ -31,14 +31,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); |
@@ -57,14 +55,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); |
@@ -664,7 +660,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); |
@@ -4264,14 +4260,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); |
} |