Index: src/arm64/code-stubs-arm64.cc |
diff --git a/src/arm64/code-stubs-arm64.cc b/src/arm64/code-stubs-arm64.cc |
index 822d988a99a9a0342728a70444b6b40c51c76f70..730fdafe7205a6dd3ba50090eb223724cb6eb0fb 100644 |
--- a/src/arm64/code-stubs-arm64.cc |
+++ b/src/arm64/code-stubs-arm64.cc |
@@ -2983,14 +2983,13 @@ static void EmitLoadTypeFeedbackVector(MacroAssembler* masm, Register vector) { |
void CallIC_ArrayStub::Generate(MacroAssembler* masm) { |
// x1 - function |
// x3 - slot id |
+ // x2 - vector |
Label miss; |
Register function = x1; |
Register feedback_vector = x2; |
Register index = x3; |
Register scratch = x4; |
- EmitLoadTypeFeedbackVector(masm, feedback_vector); |
- |
__ LoadGlobalFunction(Context::ARRAY_FUNCTION_INDEX, scratch); |
__ Cmp(function, scratch); |
__ B(ne, &miss); |
@@ -3029,6 +3028,7 @@ void CallICStub::Generate(MacroAssembler* masm) { |
// x1 - function |
// x3 - slot id (Smi) |
+ // x2 - vector |
const int with_types_offset = |
FixedArray::OffsetOfElementAt(TypeFeedbackVector::kWithTypesIndex); |
const int generic_offset = |
@@ -3044,8 +3044,6 @@ void CallICStub::Generate(MacroAssembler* masm) { |
Register index = x3; |
Register type = x4; |
- EmitLoadTypeFeedbackVector(masm, feedback_vector); |
- |
// The checks. First, does x1 match the recorded monomorphic target? |
__ Add(x4, feedback_vector, |
Operand::UntagSmiAndScale(index, kPointerSizeLog2)); |
@@ -4374,6 +4372,20 @@ void KeyedLoadICTrampolineStub::Generate(MacroAssembler* masm) { |
} |
+void CallICTrampolineStub::Generate(MacroAssembler* masm) { |
+ EmitLoadTypeFeedbackVector(masm, x2); |
+ CallICStub stub(isolate(), state()); |
+ __ Jump(stub.GetCode(), RelocInfo::CODE_TARGET); |
+} |
+ |
+ |
+void CallIC_ArrayTrampolineStub::Generate(MacroAssembler* masm) { |
+ EmitLoadTypeFeedbackVector(masm, x2); |
+ CallIC_ArrayStub stub(isolate(), state()); |
+ __ Jump(stub.GetCode(), RelocInfo::CODE_TARGET); |
+} |
+ |
+ |
// The entry hook is a "BumpSystemStackPointer" instruction (sub), followed by |
// a "Push lr" instruction, followed by a call. |
static const unsigned int kProfileEntryHookCallSize = |