| Index: src/arm/ic-arm.cc
|
| diff --git a/src/arm/ic-arm.cc b/src/arm/ic-arm.cc
|
| index 8749eea5b247ccc1f1a80562f302112f5653cc2a..4b6fccd176662d2c9ff435634f1378014a9f190f 100644
|
| --- a/src/arm/ic-arm.cc
|
| +++ b/src/arm/ic-arm.cc
|
| @@ -479,7 +479,8 @@ Object* CallIC_Miss(Arguments args);
|
| // The generated code falls through if both probes miss.
|
| static void GenerateMonomorphicCacheProbe(MacroAssembler* masm,
|
| int argc,
|
| - Code::Kind kind) {
|
| + Code::Kind kind,
|
| + Code::ExtraICState extra_ic_state) {
|
| // ----------- S t a t e -------------
|
| // -- r1 : receiver
|
| // -- r2 : name
|
| @@ -490,7 +491,7 @@ static void GenerateMonomorphicCacheProbe(MacroAssembler* masm,
|
| Code::Flags flags = Code::ComputeFlags(kind,
|
| NOT_IN_LOOP,
|
| MONOMORPHIC,
|
| - Code::kNoExtraICState,
|
| + extra_ic_state,
|
| NORMAL,
|
| argc);
|
| Isolate::Current()->stub_cache()->GenerateProbe(
|
| @@ -582,7 +583,10 @@ static void GenerateCallNormal(MacroAssembler* masm, int argc) {
|
| }
|
|
|
|
|
| -static void GenerateCallMiss(MacroAssembler* masm, int argc, IC::UtilityId id) {
|
| +static void GenerateCallMiss(MacroAssembler* masm,
|
| + int argc,
|
| + IC::UtilityId id,
|
| + Code::ExtraICState extra_ic_state) {
|
| // ----------- S t a t e -------------
|
| // -- r2 : name
|
| // -- lr : return address
|
| @@ -634,22 +638,33 @@ static void GenerateCallMiss(MacroAssembler* masm, int argc, IC::UtilityId id) {
|
| }
|
|
|
| // Invoke the function.
|
| + CallKind call_kind = CallICBase::Contextual::decode(extra_ic_state)
|
| + ? CALL_AS_FUNCTION
|
| + : CALL_AS_METHOD;
|
| ParameterCount actual(argc);
|
| - __ InvokeFunction(r1, actual, JUMP_FUNCTION);
|
| + __ InvokeFunction(r1,
|
| + actual,
|
| + JUMP_FUNCTION,
|
| + NullCallWrapper(),
|
| + call_kind);
|
| }
|
|
|
|
|
| -void CallIC::GenerateMiss(MacroAssembler* masm, int argc) {
|
| +void CallIC::GenerateMiss(MacroAssembler* masm,
|
| + int argc,
|
| + Code::ExtraICState extra_ic_state) {
|
| // ----------- S t a t e -------------
|
| // -- r2 : name
|
| // -- lr : return address
|
| // -----------------------------------
|
|
|
| - GenerateCallMiss(masm, argc, IC::kCallIC_Miss);
|
| + GenerateCallMiss(masm, argc, IC::kCallIC_Miss, extra_ic_state);
|
| }
|
|
|
|
|
| -void CallIC::GenerateMegamorphic(MacroAssembler* masm, int argc) {
|
| +void CallIC::GenerateMegamorphic(MacroAssembler* masm,
|
| + int argc,
|
| + Code::ExtraICState extra_ic_state) {
|
| // ----------- S t a t e -------------
|
| // -- r2 : name
|
| // -- lr : return address
|
| @@ -657,8 +672,8 @@ void CallIC::GenerateMegamorphic(MacroAssembler* masm, int argc) {
|
|
|
| // Get the receiver of the function from the stack into r1.
|
| __ ldr(r1, MemOperand(sp, argc * kPointerSize));
|
| - GenerateMonomorphicCacheProbe(masm, argc, Code::CALL_IC);
|
| - GenerateMiss(masm, argc);
|
| + GenerateMonomorphicCacheProbe(masm, argc, Code::CALL_IC, extra_ic_state);
|
| + GenerateMiss(masm, argc, extra_ic_state);
|
| }
|
|
|
|
|
| @@ -669,7 +684,7 @@ void CallIC::GenerateNormal(MacroAssembler* masm, int argc) {
|
| // -----------------------------------
|
|
|
| GenerateCallNormal(masm, argc);
|
| - GenerateMiss(masm, argc);
|
| + GenerateMiss(masm, argc, Code::kNoExtraICState);
|
| }
|
|
|
|
|
| @@ -679,7 +694,7 @@ void KeyedCallIC::GenerateMiss(MacroAssembler* masm, int argc) {
|
| // -- lr : return address
|
| // -----------------------------------
|
|
|
| - GenerateCallMiss(masm, argc, IC::kKeyedCallIC_Miss);
|
| + GenerateCallMiss(masm, argc, IC::kKeyedCallIC_Miss, Code::kNoExtraICState);
|
| }
|
|
|
|
|
| @@ -765,7 +780,10 @@ void KeyedCallIC::GenerateMegamorphic(MacroAssembler* masm, int argc) {
|
|
|
| __ bind(&lookup_monomorphic_cache);
|
| __ IncrementCounter(counters->keyed_call_generic_lookup_cache(), 1, r0, r3);
|
| - GenerateMonomorphicCacheProbe(masm, argc, Code::KEYED_CALL_IC);
|
| + GenerateMonomorphicCacheProbe(masm,
|
| + argc,
|
| + Code::KEYED_CALL_IC,
|
| + Code::kNoExtraICState);
|
| // Fall through on miss.
|
|
|
| __ bind(&slow_call);
|
|
|