| Index: src/x87/code-stubs-x87.cc
|
| diff --git a/src/x87/code-stubs-x87.cc b/src/x87/code-stubs-x87.cc
|
| index adecb38065fb681877a1bd2caf7287ee5ac0c11b..0d59b180680c553098071a2804e170fcc51a9c42 100644
|
| --- a/src/x87/code-stubs-x87.cc
|
| +++ b/src/x87/code-stubs-x87.cc
|
| @@ -1883,14 +1883,6 @@ void CallConstructStub::Generate(MacroAssembler* masm) {
|
| }
|
|
|
|
|
| -static void EmitLoadTypeFeedbackVector(MacroAssembler* masm, Register vector) {
|
| - __ mov(vector, Operand(ebp, JavaScriptFrameConstants::kFunctionOffset));
|
| - __ mov(vector, FieldOperand(vector, JSFunction::kSharedFunctionInfoOffset));
|
| - __ mov(vector, FieldOperand(vector,
|
| - SharedFunctionInfo::kFeedbackVectorOffset));
|
| -}
|
| -
|
| -
|
| void CallICStub::HandleArrayCase(MacroAssembler* masm, Label* miss) {
|
| // edi - function
|
| // edx - slot id
|
| @@ -3991,14 +3983,14 @@ void StubFailureTrampolineStub::Generate(MacroAssembler* masm) {
|
|
|
|
|
| void LoadICTrampolineStub::Generate(MacroAssembler* masm) {
|
| - EmitLoadTypeFeedbackVector(masm, LoadWithVectorDescriptor::VectorRegister());
|
| + __ EmitLoadTypeFeedbackVector(LoadWithVectorDescriptor::VectorRegister());
|
| LoadICStub stub(isolate(), state());
|
| stub.GenerateForTrampoline(masm);
|
| }
|
|
|
|
|
| void KeyedLoadICTrampolineStub::Generate(MacroAssembler* masm) {
|
| - EmitLoadTypeFeedbackVector(masm, LoadWithVectorDescriptor::VectorRegister());
|
| + __ EmitLoadTypeFeedbackVector(LoadWithVectorDescriptor::VectorRegister());
|
| KeyedLoadICStub stub(isolate(), state());
|
| stub.GenerateForTrampoline(masm);
|
| }
|
| @@ -4222,14 +4214,14 @@ void KeyedLoadICStub::GenerateImpl(MacroAssembler* masm, bool in_frame) {
|
|
|
|
|
| void VectorStoreICTrampolineStub::Generate(MacroAssembler* masm) {
|
| - EmitLoadTypeFeedbackVector(masm, VectorStoreICDescriptor::VectorRegister());
|
| + __ EmitLoadTypeFeedbackVector(VectorStoreICDescriptor::VectorRegister());
|
| VectorStoreICStub stub(isolate(), state());
|
| stub.GenerateForTrampoline(masm);
|
| }
|
|
|
|
|
| void VectorKeyedStoreICTrampolineStub::Generate(MacroAssembler* masm) {
|
| - EmitLoadTypeFeedbackVector(masm, VectorStoreICDescriptor::VectorRegister());
|
| + __ EmitLoadTypeFeedbackVector(VectorStoreICDescriptor::VectorRegister());
|
| VectorKeyedStoreICStub stub(isolate(), state());
|
| stub.GenerateForTrampoline(masm);
|
| }
|
| @@ -4582,7 +4574,7 @@ void VectorKeyedStoreICStub::GenerateImpl(MacroAssembler* masm, bool in_frame) {
|
|
|
|
|
| void CallICTrampolineStub::Generate(MacroAssembler* masm) {
|
| - EmitLoadTypeFeedbackVector(masm, ebx);
|
| + __ EmitLoadTypeFeedbackVector(ebx);
|
| CallICStub stub(isolate(), state());
|
| __ jmp(stub.GetCode(), RelocInfo::CODE_TARGET);
|
| }
|
|
|