| Index: src/x64/full-codegen-x64.cc
|
| diff --git a/src/x64/full-codegen-x64.cc b/src/x64/full-codegen-x64.cc
|
| index cf9978541df62e40fe5efde707e1aba8921223a0..463fbdc0dc5e125993c1a37f99beb64366482afe 100644
|
| --- a/src/x64/full-codegen-x64.cc
|
| +++ b/src/x64/full-codegen-x64.cc
|
| @@ -1294,7 +1294,7 @@ void FullCodeGenerator::EmitLoadHomeObject(SuperReference* expr) {
|
| Handle<Symbol> home_object_symbol(isolate()->heap()->home_object_symbol());
|
| __ Move(LoadDescriptor::NameRegister(), home_object_symbol);
|
|
|
| - __ Move(VectorLoadICDescriptor::SlotRegister(),
|
| + __ Move(LoadDescriptor::SlotRegister(),
|
| SmiFromSlot(expr->HomeObjectFeedbackSlot()));
|
| CallLoadIC(NOT_CONTEXTUAL);
|
|
|
| @@ -1372,7 +1372,7 @@ void FullCodeGenerator::EmitLoadGlobalCheckExtensions(VariableProxy* proxy,
|
| // load IC call.
|
| __ movp(LoadDescriptor::ReceiverRegister(), GlobalObjectOperand());
|
| __ Move(LoadDescriptor::NameRegister(), proxy->var()->name());
|
| - __ Move(VectorLoadICDescriptor::SlotRegister(),
|
| + __ Move(LoadDescriptor::SlotRegister(),
|
| SmiFromSlot(proxy->VariableFeedbackSlot()));
|
|
|
| ContextualMode mode = (typeof_state == INSIDE_TYPEOF)
|
| @@ -1457,7 +1457,7 @@ void FullCodeGenerator::EmitVariableLoad(VariableProxy* proxy) {
|
| Comment cmnt(masm_, "[ Global variable");
|
| __ Move(LoadDescriptor::NameRegister(), var->name());
|
| __ movp(LoadDescriptor::ReceiverRegister(), GlobalObjectOperand());
|
| - __ Move(VectorLoadICDescriptor::SlotRegister(),
|
| + __ Move(LoadDescriptor::SlotRegister(),
|
| SmiFromSlot(proxy->VariableFeedbackSlot()));
|
| CallGlobalLoadIC(var->name());
|
| context()->Plug(rax);
|
| @@ -2150,7 +2150,7 @@ void FullCodeGenerator::VisitYield(Yield* expr) {
|
| // result = receiver[f](arg);
|
| __ bind(&l_call);
|
| __ movp(load_receiver, Operand(rsp, kPointerSize));
|
| - __ Move(VectorLoadICDescriptor::SlotRegister(),
|
| + __ Move(LoadDescriptor::SlotRegister(),
|
| SmiFromSlot(expr->KeyedLoadFeedbackSlot()));
|
| Handle<Code> ic = CodeFactory::KeyedLoadIC(isolate()).code();
|
| CallIC(ic, TypeFeedbackId::None());
|
| @@ -2167,7 +2167,7 @@ void FullCodeGenerator::VisitYield(Yield* expr) {
|
| __ Move(load_receiver, rax);
|
| __ Push(load_receiver); // save result
|
| __ LoadRoot(load_name, Heap::kdone_stringRootIndex); // "done"
|
| - __ Move(VectorLoadICDescriptor::SlotRegister(),
|
| + __ Move(LoadDescriptor::SlotRegister(),
|
| SmiFromSlot(expr->DoneFeedbackSlot()));
|
| CallLoadIC(NOT_CONTEXTUAL); // rax=result.done
|
| Handle<Code> bool_ic = ToBooleanStub::GetUninitialized(isolate());
|
| @@ -2178,7 +2178,7 @@ void FullCodeGenerator::VisitYield(Yield* expr) {
|
| // result.value
|
| __ Pop(load_receiver); // result
|
| __ LoadRoot(load_name, Heap::kvalue_stringRootIndex); // "value"
|
| - __ Move(VectorLoadICDescriptor::SlotRegister(),
|
| + __ Move(LoadDescriptor::SlotRegister(),
|
| SmiFromSlot(expr->ValueFeedbackSlot()));
|
| CallLoadIC(NOT_CONTEXTUAL); // result.value in rax
|
| context()->DropAndPlug(2, rax); // drop iter and g
|
| @@ -2318,7 +2318,7 @@ void FullCodeGenerator::EmitNamedPropertyLoad(Property* prop) {
|
| DCHECK(!prop->IsSuperAccess());
|
|
|
| __ Move(LoadDescriptor::NameRegister(), key->value());
|
| - __ Move(VectorLoadICDescriptor::SlotRegister(),
|
| + __ Move(LoadDescriptor::SlotRegister(),
|
| SmiFromSlot(prop->PropertyFeedbackSlot()));
|
| CallLoadIC(NOT_CONTEXTUAL);
|
| }
|
| @@ -2339,7 +2339,7 @@ void FullCodeGenerator::EmitNamedSuperPropertyLoad(Property* prop) {
|
| void FullCodeGenerator::EmitKeyedPropertyLoad(Property* prop) {
|
| SetSourcePosition(prop->position());
|
| Handle<Code> ic = CodeFactory::KeyedLoadIC(isolate()).code();
|
| - __ Move(VectorLoadICDescriptor::SlotRegister(),
|
| + __ Move(LoadDescriptor::SlotRegister(),
|
| SmiFromSlot(prop->PropertyFeedbackSlot()));
|
| CallIC(ic);
|
| }
|
| @@ -4554,7 +4554,7 @@ void FullCodeGenerator::EmitLoadJSRuntimeFunction(CallRuntime* expr) {
|
| // Load the function from the receiver.
|
| __ movp(LoadDescriptor::ReceiverRegister(), Operand(rsp, 0));
|
| __ Move(LoadDescriptor::NameRegister(), expr->name());
|
| - __ Move(VectorLoadICDescriptor::SlotRegister(),
|
| + __ Move(LoadDescriptor::SlotRegister(),
|
| SmiFromSlot(expr->CallRuntimeFeedbackSlot()));
|
| CallLoadIC(NOT_CONTEXTUAL);
|
| }
|
| @@ -4991,7 +4991,7 @@ void FullCodeGenerator::VisitForTypeofValue(Expression* expr) {
|
| Comment cmnt(masm_, "[ Global variable");
|
| __ Move(LoadDescriptor::NameRegister(), proxy->name());
|
| __ movp(LoadDescriptor::ReceiverRegister(), GlobalObjectOperand());
|
| - __ Move(VectorLoadICDescriptor::SlotRegister(),
|
| + __ Move(LoadDescriptor::SlotRegister(),
|
| SmiFromSlot(proxy->VariableFeedbackSlot()));
|
| // Use a regular load, not a contextual load, to avoid a reference
|
| // error.
|
|
|