Index: runtime/vm/stub_code_mips.cc |
diff --git a/runtime/vm/stub_code_mips.cc b/runtime/vm/stub_code_mips.cc |
index 5fc14021ce38b3c5417028e63e84095803aabe07..cf74009de98729aa365a53d6d9de8f0fdeeb4976 100644 |
--- a/runtime/vm/stub_code_mips.cc |
+++ b/runtime/vm/stub_code_mips.cc |
@@ -1403,7 +1403,6 @@ void StubCode::GenerateNArgsCheckInlineCacheStub( |
intptr_t num_args, |
const RuntimeEntry& handle_ic_miss, |
Token::Kind kind, |
- RangeCollectionMode range_collection_mode, |
bool optimized) { |
__ Comment("NArgsCheckInlineCacheStub"); |
ASSERT(num_args > 0); |
@@ -1430,18 +1429,7 @@ void StubCode::GenerateNArgsCheckInlineCacheStub( |
__ Bind(&done_stepping); |
} |
- __ Comment("Range feedback collection"); |
Label not_smi_or_overflow; |
- if (range_collection_mode == kCollectRanges) { |
- ASSERT((num_args == 1) || (num_args == 2)); |
- if (num_args == 2) { |
- __ lw(T0, Address(SP, 1 * kWordSize)); |
- __ UpdateRangeFeedback(T0, 0, S5, T1, ¬_smi_or_overflow); |
- } |
- |
- __ lw(T0, Address(SP, 0 * kWordSize)); |
- __ UpdateRangeFeedback(T0, num_args - 1, S5, T1, ¬_smi_or_overflow); |
- } |
if (kind != Token::kILLEGAL) { |
EmitFastSmiOp(assembler, kind, num_args, ¬_smi_or_overflow); |
} |
@@ -1589,35 +1577,8 @@ void StubCode::GenerateNArgsCheckInlineCacheStub( |
__ mov(T0, T3); |
Label is_compiled; |
__ lw(T4, FieldAddress(T0, Function::entry_point_offset())); |
- if (range_collection_mode == kCollectRanges) { |
- const intptr_t frame_size = num_args + 2; |
- __ lw(T3, Address(SP, 0 * kWordSize)); |
- if (num_args == 2) { |
- __ lw(T1, Address(SP, 1 * kWordSize)); |
- } |
- __ EnterStubFrame(); |
- __ addiu(SP, SP, Immediate(- frame_size * kWordSize)); |
- __ sw(RA, Address(SP, (frame_size - 1) * kWordSize)); // Return address. |
- __ sw(S5, Address(SP, (frame_size - 2) * kWordSize)); // Preserve IC data. |
- __ sw(T3, Address(SP, 0 * kWordSize)); |
- if (num_args == 2) { |
- __ sw(T1, Address(SP, 1 * kWordSize)); |
- } |
- __ lw(CODE_REG, FieldAddress(T0, Function::code_offset())); |
- __ jalr(T4); |
- __ lw(S5, Address(SP, (frame_size - 2) * kWordSize)); |
- __ lw(RA, Address(SP, (frame_size - 1) * kWordSize)); |
- Label done; |
- __ UpdateRangeFeedback(V0, 2, S5, T1, &done); |
- __ Bind(&done); |
- __ addiu(SP, SP, Immediate(frame_size * kWordSize)); |
- __ RestoreCodePointer(); |
- __ LeaveStubFrame(); |
- __ Ret(); |
- } else { |
- __ lw(CODE_REG, FieldAddress(T0, Function::code_offset())); |
- __ jr(T4); |
- } |
+ __ lw(CODE_REG, FieldAddress(T0, Function::code_offset())); |
+ __ jr(T4); |
// Call single step callback in debugger. |
if (FLAG_support_debugger && !optimized) { |
@@ -1650,40 +1611,35 @@ void StubCode::GenerateNArgsCheckInlineCacheStub( |
void StubCode::GenerateOneArgCheckInlineCacheStub(Assembler* assembler) { |
GenerateUsageCounterIncrement(assembler, T0); |
GenerateNArgsCheckInlineCacheStub(assembler, 1, |
- kInlineCacheMissHandlerOneArgRuntimeEntry, Token::kILLEGAL, |
- kIgnoreRanges); |
+ kInlineCacheMissHandlerOneArgRuntimeEntry, Token::kILLEGAL); |
} |
void StubCode::GenerateTwoArgsCheckInlineCacheStub(Assembler* assembler) { |
GenerateUsageCounterIncrement(assembler, T0); |
GenerateNArgsCheckInlineCacheStub(assembler, 2, |
- kInlineCacheMissHandlerTwoArgsRuntimeEntry, Token::kILLEGAL, |
- kIgnoreRanges); |
+ kInlineCacheMissHandlerTwoArgsRuntimeEntry, Token::kILLEGAL); |
} |
void StubCode::GenerateSmiAddInlineCacheStub(Assembler* assembler) { |
GenerateUsageCounterIncrement(assembler, T0); |
GenerateNArgsCheckInlineCacheStub(assembler, 2, |
- kInlineCacheMissHandlerTwoArgsRuntimeEntry, Token::kADD, |
- kCollectRanges); |
+ kInlineCacheMissHandlerTwoArgsRuntimeEntry, Token::kADD); |
} |
void StubCode::GenerateSmiSubInlineCacheStub(Assembler* assembler) { |
GenerateUsageCounterIncrement(assembler, T0); |
GenerateNArgsCheckInlineCacheStub(assembler, 2, |
- kInlineCacheMissHandlerTwoArgsRuntimeEntry, Token::kSUB, |
- kCollectRanges); |
+ kInlineCacheMissHandlerTwoArgsRuntimeEntry, Token::kSUB); |
} |
void StubCode::GenerateSmiEqualInlineCacheStub(Assembler* assembler) { |
GenerateUsageCounterIncrement(assembler, T0); |
GenerateNArgsCheckInlineCacheStub(assembler, 2, |
- kInlineCacheMissHandlerTwoArgsRuntimeEntry, Token::kEQ, |
- kIgnoreRanges); |
+ kInlineCacheMissHandlerTwoArgsRuntimeEntry, Token::kEQ); |
} |
@@ -1692,8 +1648,7 @@ void StubCode::GenerateUnaryRangeCollectingInlineCacheStub( |
GenerateUsageCounterIncrement(assembler, T0); |
GenerateNArgsCheckInlineCacheStub(assembler, 1, |
kInlineCacheMissHandlerOneArgRuntimeEntry, |
- Token::kILLEGAL, |
- kCollectRanges); |
+ Token::kILLEGAL); |
} |
@@ -1702,8 +1657,7 @@ void StubCode::GenerateBinaryRangeCollectingInlineCacheStub( |
GenerateUsageCounterIncrement(assembler, T0); |
GenerateNArgsCheckInlineCacheStub(assembler, 2, |
kInlineCacheMissHandlerTwoArgsRuntimeEntry, |
- Token::kILLEGAL, |
- kCollectRanges); |
+ Token::kILLEGAL); |
} |
@@ -1712,7 +1666,7 @@ void StubCode::GenerateOneArgOptimizedCheckInlineCacheStub( |
GenerateOptimizedUsageCounterIncrement(assembler); |
GenerateNArgsCheckInlineCacheStub(assembler, 1, |
kInlineCacheMissHandlerOneArgRuntimeEntry, Token::kILLEGAL, |
- kIgnoreRanges, true /* optimized */); |
+ true /* optimized */); |
} |
@@ -1721,7 +1675,7 @@ void StubCode::GenerateTwoArgsOptimizedCheckInlineCacheStub( |
GenerateOptimizedUsageCounterIncrement(assembler); |
GenerateNArgsCheckInlineCacheStub(assembler, 2, |
kInlineCacheMissHandlerTwoArgsRuntimeEntry, Token::kILLEGAL, |
- kIgnoreRanges, true /* optimized */); |
+ true /* optimized */); |
} |
@@ -1801,16 +1755,14 @@ void StubCode::GenerateZeroArgsUnoptimizedStaticCallStub(Assembler* assembler) { |
void StubCode::GenerateOneArgUnoptimizedStaticCallStub(Assembler* assembler) { |
GenerateUsageCounterIncrement(assembler, T0); |
GenerateNArgsCheckInlineCacheStub( |
- assembler, 1, kStaticCallMissHandlerOneArgRuntimeEntry, Token::kILLEGAL, |
- kIgnoreRanges); |
+ assembler, 1, kStaticCallMissHandlerOneArgRuntimeEntry, Token::kILLEGAL); |
} |
void StubCode::GenerateTwoArgsUnoptimizedStaticCallStub(Assembler* assembler) { |
GenerateUsageCounterIncrement(assembler, T0); |
GenerateNArgsCheckInlineCacheStub(assembler, 2, |
- kStaticCallMissHandlerTwoArgsRuntimeEntry, Token::kILLEGAL, |
- kIgnoreRanges); |
+ kStaticCallMissHandlerTwoArgsRuntimeEntry, Token::kILLEGAL); |
} |