| Index: src/arm/code-stubs-arm.cc
|
| diff --git a/src/arm/code-stubs-arm.cc b/src/arm/code-stubs-arm.cc
|
| index 5261e9a9f743ac5c540260a08ecafb9fa431b912..a8a4b5f5ac5f24bf4e3f0b4d70c2cd2f2acd745a 100644
|
| --- a/src/arm/code-stubs-arm.cc
|
| +++ b/src/arm/code-stubs-arm.cc
|
| @@ -2507,15 +2507,6 @@ void CallConstructStub::Generate(MacroAssembler* masm) {
|
| }
|
|
|
|
|
| -static void EmitLoadTypeFeedbackVector(MacroAssembler* masm, Register vector) {
|
| - __ ldr(vector, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset));
|
| - __ ldr(vector, FieldMemOperand(vector,
|
| - JSFunction::kSharedFunctionInfoOffset));
|
| - __ ldr(vector, FieldMemOperand(vector,
|
| - SharedFunctionInfo::kFeedbackVectorOffset));
|
| -}
|
| -
|
| -
|
| void CallICStub::HandleArrayCase(MacroAssembler* masm, Label* miss) {
|
| // r1 - function
|
| // r3 - slot id
|
| @@ -4241,21 +4232,21 @@ 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);
|
| }
|
|
|
|
|
| void CallICTrampolineStub::Generate(MacroAssembler* masm) {
|
| - EmitLoadTypeFeedbackVector(masm, r2);
|
| + __ EmitLoadTypeFeedbackVector(r2);
|
| CallICStub stub(isolate(), state());
|
| __ Jump(stub.GetCode(), RelocInfo::CODE_TARGET);
|
| }
|
| @@ -4472,14 +4463,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);
|
| }
|
|
|