Index: src/arm/builtins-arm.cc |
diff --git a/src/arm/builtins-arm.cc b/src/arm/builtins-arm.cc |
index 8d95694038ed57605741674b15b5eff43f7ed737..cf91753e1a8956c8136c253427233b678f2bc05b 100644 |
--- a/src/arm/builtins-arm.cc |
+++ b/src/arm/builtins-arm.cc |
@@ -1436,6 +1436,7 @@ void Builtins::Generate_FunctionCall(MacroAssembler* masm) { |
static void Generate_PushAppliedArguments(MacroAssembler* masm, |
+ const int vectorOffset, |
const int argumentsOffset, |
const int indexOffset, |
const int limitOffset) { |
@@ -1453,13 +1454,9 @@ static void Generate_PushAppliedArguments(MacroAssembler* masm, |
__ ldr(receiver, MemOperand(fp, argumentsOffset)); |
// Use inline caching to speed up access to arguments. |
- Code::Kind kinds[] = {Code::KEYED_LOAD_IC}; |
- FeedbackVectorSpec spec(0, 1, kinds); |
- Handle<TypeFeedbackVector> feedback_vector = |
- masm->isolate()->factory()->NewTypeFeedbackVector(&spec); |
- int index = feedback_vector->GetIndex(FeedbackVectorICSlot(0)); |
- __ mov(slot, Operand(Smi::FromInt(index))); |
- __ Move(vector, feedback_vector); |
+ int slot_index = TypeFeedbackVector::PushAppliedArgumentsIndex(); |
+ __ mov(slot, Operand(Smi::FromInt(slot_index))); |
+ __ ldr(vector, MemOperand(fp, vectorOffset)); |
Handle<Code> ic = |
KeyedLoadICStub(masm->isolate(), LoadICState(kNoExtraICState)).GetCode(); |
__ Call(ic, RelocInfo::CODE_TARGET); |
@@ -1494,6 +1491,13 @@ static void Generate_ApplyHelper(MacroAssembler* masm, bool targetIsArgument) { |
const int kArgumentsOffset = kFPOnStackSize + kPCOnStackSize; |
const int kReceiverOffset = kArgumentsOffset + kPointerSize; |
const int kFunctionOffset = kReceiverOffset + kPointerSize; |
+ const int kVectorOffset = |
+ InternalFrameConstants::kCodeOffset - 1 * kPointerSize; |
+ |
+ // Push the vector. |
+ __ ldr(r1, FieldMemOperand(r1, JSFunction::kSharedFunctionInfoOffset)); |
+ __ ldr(r1, FieldMemOperand(r1, SharedFunctionInfo::kFeedbackVectorOffset)); |
+ __ Push(r1); |
__ ldr(r0, MemOperand(fp, kFunctionOffset)); // get the function |
__ push(r0); |
@@ -1508,10 +1512,8 @@ static void Generate_ApplyHelper(MacroAssembler* masm, bool targetIsArgument) { |
Generate_CheckStackOverflow(masm, kFunctionOffset, r0, kArgcIsSmiTagged); |
// Push current limit and index. |
- const int kIndexOffset = |
- StandardFrameConstants::kExpressionsOffset - (2 * kPointerSize); |
- const int kLimitOffset = |
- StandardFrameConstants::kExpressionsOffset - (1 * kPointerSize); |
+ const int kIndexOffset = kVectorOffset - (2 * kPointerSize); |
+ const int kLimitOffset = kVectorOffset - (1 * kPointerSize); |
__ push(r0); // limit |
__ mov(r1, Operand::Zero()); // initial index |
__ push(r1); |
@@ -1574,8 +1576,8 @@ static void Generate_ApplyHelper(MacroAssembler* masm, bool targetIsArgument) { |
__ push(r0); |
// Copy all arguments from the array to the stack. |
- Generate_PushAppliedArguments( |
- masm, kArgumentsOffset, kIndexOffset, kLimitOffset); |
+ Generate_PushAppliedArguments(masm, kVectorOffset, kArgumentsOffset, |
+ kIndexOffset, kLimitOffset); |
// Call the function. |
Label call_proxy; |
@@ -1614,6 +1616,13 @@ static void Generate_ConstructHelper(MacroAssembler* masm) { |
const int kNewTargetOffset = kFPOnStackSize + kPCOnStackSize; |
const int kArgumentsOffset = kNewTargetOffset + kPointerSize; |
const int kFunctionOffset = kArgumentsOffset + kPointerSize; |
+ static const int kVectorOffset = |
+ InternalFrameConstants::kCodeOffset - 1 * kPointerSize; |
+ |
+ // Push the vector. |
+ __ ldr(r1, FieldMemOperand(r1, JSFunction::kSharedFunctionInfoOffset)); |
+ __ ldr(r1, FieldMemOperand(r1, SharedFunctionInfo::kFeedbackVectorOffset)); |
+ __ Push(r1); |
// If newTarget is not supplied, set it to constructor |
Label validate_arguments; |
@@ -1636,10 +1645,8 @@ static void Generate_ConstructHelper(MacroAssembler* masm) { |
Generate_CheckStackOverflow(masm, kFunctionOffset, r0, kArgcIsSmiTagged); |
// Push current limit and index. |
- const int kIndexOffset = |
- StandardFrameConstants::kExpressionsOffset - (2 * kPointerSize); |
- const int kLimitOffset = |
- StandardFrameConstants::kExpressionsOffset - (1 * kPointerSize); |
+ const int kIndexOffset = kVectorOffset - (2 * kPointerSize); |
+ const int kLimitOffset = kVectorOffset - (1 * kPointerSize); |
__ push(r0); // limit |
__ mov(r1, Operand::Zero()); // initial index |
__ push(r1); |
@@ -1648,8 +1655,8 @@ static void Generate_ConstructHelper(MacroAssembler* masm) { |
__ push(r0); |
// Copy all arguments from the array to the stack. |
- Generate_PushAppliedArguments( |
- masm, kArgumentsOffset, kIndexOffset, kLimitOffset); |
+ Generate_PushAppliedArguments(masm, kVectorOffset, kArgumentsOffset, |
+ kIndexOffset, kLimitOffset); |
// Use undefined feedback vector |
__ LoadRoot(r2, Heap::kUndefinedValueRootIndex); |