| Index: src/x87/full-codegen-x87.cc
|
| diff --git a/src/x87/full-codegen-x87.cc b/src/x87/full-codegen-x87.cc
|
| index e05b7381bca891147c5147c1d012df4512ec5313..ac27d0aaec6955a868a1aefd11e7c975615a5b91 100644
|
| --- a/src/x87/full-codegen-x87.cc
|
| +++ b/src/x87/full-codegen-x87.cc
|
| @@ -1253,7 +1253,7 @@ void FullCodeGenerator::EmitLoadHomeObject(SuperReference* expr) {
|
| Handle<Symbol> home_object_symbol(isolate()->heap()->home_object_symbol());
|
| __ mov(LoadDescriptor::NameRegister(), home_object_symbol);
|
|
|
| - __ mov(VectorLoadICDescriptor::SlotRegister(),
|
| + __ mov(LoadDescriptor::SlotRegister(),
|
| Immediate(SmiFromSlot(expr->HomeObjectFeedbackSlot())));
|
| CallLoadIC(NOT_CONTEXTUAL);
|
|
|
| @@ -1330,7 +1330,7 @@ void FullCodeGenerator::EmitLoadGlobalCheckExtensions(VariableProxy* proxy,
|
| // load IC call.
|
| __ mov(LoadDescriptor::ReceiverRegister(), GlobalObjectOperand());
|
| __ mov(LoadDescriptor::NameRegister(), proxy->var()->name());
|
| - __ mov(VectorLoadICDescriptor::SlotRegister(),
|
| + __ mov(LoadDescriptor::SlotRegister(),
|
| Immediate(SmiFromSlot(proxy->VariableFeedbackSlot())));
|
|
|
| ContextualMode mode = (typeof_state == INSIDE_TYPEOF)
|
| @@ -1416,7 +1416,7 @@ void FullCodeGenerator::EmitVariableLoad(VariableProxy* proxy) {
|
| Comment cmnt(masm_, "[ Global variable");
|
| __ mov(LoadDescriptor::ReceiverRegister(), GlobalObjectOperand());
|
| __ mov(LoadDescriptor::NameRegister(), var->name());
|
| - __ mov(VectorLoadICDescriptor::SlotRegister(),
|
| + __ mov(LoadDescriptor::SlotRegister(),
|
| Immediate(SmiFromSlot(proxy->VariableFeedbackSlot())));
|
| CallGlobalLoadIC(var->name());
|
| context()->Plug(eax);
|
| @@ -2109,7 +2109,7 @@ void FullCodeGenerator::VisitYield(Yield* expr) {
|
| // result = receiver[f](arg);
|
| __ bind(&l_call);
|
| __ mov(load_receiver, Operand(esp, kPointerSize));
|
| - __ mov(VectorLoadICDescriptor::SlotRegister(),
|
| + __ mov(LoadDescriptor::SlotRegister(),
|
| Immediate(SmiFromSlot(expr->KeyedLoadFeedbackSlot())));
|
| Handle<Code> ic = CodeFactory::KeyedLoadIC(isolate()).code();
|
| CallIC(ic, TypeFeedbackId::None());
|
| @@ -2127,7 +2127,7 @@ void FullCodeGenerator::VisitYield(Yield* expr) {
|
| __ Move(load_receiver, eax); // result
|
| __ mov(load_name,
|
| isolate()->factory()->done_string()); // "done"
|
| - __ mov(VectorLoadICDescriptor::SlotRegister(),
|
| + __ mov(LoadDescriptor::SlotRegister(),
|
| Immediate(SmiFromSlot(expr->DoneFeedbackSlot())));
|
| CallLoadIC(NOT_CONTEXTUAL); // result.done in eax
|
| Handle<Code> bool_ic = ToBooleanStub::GetUninitialized(isolate());
|
| @@ -2139,7 +2139,7 @@ void FullCodeGenerator::VisitYield(Yield* expr) {
|
| __ pop(load_receiver); // result
|
| __ mov(load_name,
|
| isolate()->factory()->value_string()); // "value"
|
| - __ mov(VectorLoadICDescriptor::SlotRegister(),
|
| + __ mov(LoadDescriptor::SlotRegister(),
|
| Immediate(SmiFromSlot(expr->ValueFeedbackSlot())));
|
| CallLoadIC(NOT_CONTEXTUAL); // result.value in eax
|
| context()->DropAndPlug(2, eax); // drop iter and g
|
| @@ -2278,7 +2278,7 @@ void FullCodeGenerator::EmitNamedPropertyLoad(Property* prop) {
|
| DCHECK(!prop->IsSuperAccess());
|
|
|
| __ mov(LoadDescriptor::NameRegister(), Immediate(key->value()));
|
| - __ mov(VectorLoadICDescriptor::SlotRegister(),
|
| + __ mov(LoadDescriptor::SlotRegister(),
|
| Immediate(SmiFromSlot(prop->PropertyFeedbackSlot())));
|
| CallLoadIC(NOT_CONTEXTUAL);
|
| }
|
| @@ -2299,7 +2299,7 @@ void FullCodeGenerator::EmitNamedSuperPropertyLoad(Property* prop) {
|
| void FullCodeGenerator::EmitKeyedPropertyLoad(Property* prop) {
|
| SetSourcePosition(prop->position());
|
| Handle<Code> ic = CodeFactory::KeyedLoadIC(isolate()).code();
|
| - __ mov(VectorLoadICDescriptor::SlotRegister(),
|
| + __ mov(LoadDescriptor::SlotRegister(),
|
| Immediate(SmiFromSlot(prop->PropertyFeedbackSlot())));
|
| CallIC(ic);
|
| }
|
| @@ -4524,7 +4524,7 @@ void FullCodeGenerator::EmitLoadJSRuntimeFunction(CallRuntime* expr) {
|
| // Load the function from the receiver.
|
| __ mov(LoadDescriptor::ReceiverRegister(), Operand(esp, 0));
|
| __ mov(LoadDescriptor::NameRegister(), Immediate(expr->name()));
|
| - __ mov(VectorLoadICDescriptor::SlotRegister(),
|
| + __ mov(LoadDescriptor::SlotRegister(),
|
| Immediate(SmiFromSlot(expr->CallRuntimeFeedbackSlot())));
|
| CallLoadIC(NOT_CONTEXTUAL);
|
| }
|
| @@ -4965,7 +4965,7 @@ void FullCodeGenerator::VisitForTypeofValue(Expression* expr) {
|
| Comment cmnt(masm_, "[ Global variable");
|
| __ mov(LoadDescriptor::ReceiverRegister(), GlobalObjectOperand());
|
| __ mov(LoadDescriptor::NameRegister(), Immediate(proxy->name()));
|
| - __ mov(VectorLoadICDescriptor::SlotRegister(),
|
| + __ mov(LoadDescriptor::SlotRegister(),
|
| Immediate(SmiFromSlot(proxy->VariableFeedbackSlot())));
|
| // Use a regular load, not a contextual load, to avoid a reference
|
| // error.
|
|
|