| Index: src/full-codegen/mips/full-codegen-mips.cc
|
| diff --git a/src/full-codegen/mips/full-codegen-mips.cc b/src/full-codegen/mips/full-codegen-mips.cc
|
| index 5a3512224d21d2a14f55e4f86e182d60087f484c..c2bc59e907565b23ea00ac114428242837fadcc2 100644
|
| --- a/src/full-codegen/mips/full-codegen-mips.cc
|
| +++ b/src/full-codegen/mips/full-codegen-mips.cc
|
| @@ -4125,7 +4125,6 @@ void BackEdgeTable::PatchAt(Code* unoptimized_code,
|
| patcher.masm()->slt(at, a3, zero_reg);
|
| break;
|
| case ON_STACK_REPLACEMENT:
|
| - case OSR_AFTER_STACK_CHECK:
|
| // addiu at, zero_reg, 1
|
| // beq at, zero_reg, ok ;; Not changed
|
| // lui t9, <on-stack replacement address> upper
|
| @@ -4153,7 +4152,9 @@ BackEdgeTable::BackEdgeState BackEdgeTable::GetBackEdgeState(
|
| Address pc) {
|
| static const int kInstrSize = Assembler::kInstrSize;
|
| Address branch_address = pc - 6 * kInstrSize;
|
| +#ifdef DEBUG
|
| Address pc_immediate_load_address = pc - 4 * kInstrSize;
|
| +#endif
|
|
|
| DCHECK(Assembler::IsBeq(Assembler::instr_at(pc - 5 * kInstrSize)));
|
| if (!Assembler::IsAddImmediate(Assembler::instr_at(branch_address))) {
|
| @@ -4166,18 +4167,11 @@ BackEdgeTable::BackEdgeState BackEdgeTable::GetBackEdgeState(
|
|
|
| DCHECK(Assembler::IsAddImmediate(Assembler::instr_at(branch_address)));
|
|
|
| - if (reinterpret_cast<uint32_t>(
|
| - Assembler::target_address_at(pc_immediate_load_address)) ==
|
| - reinterpret_cast<uint32_t>(
|
| - isolate->builtins()->OnStackReplacement()->entry())) {
|
| - return ON_STACK_REPLACEMENT;
|
| - }
|
| -
|
| DCHECK(reinterpret_cast<uint32_t>(
|
| - Assembler::target_address_at(pc_immediate_load_address)) ==
|
| + Assembler::target_address_at(pc_immediate_load_address)) ==
|
| reinterpret_cast<uint32_t>(
|
| - isolate->builtins()->OsrAfterStackCheck()->entry()));
|
| - return OSR_AFTER_STACK_CHECK;
|
| + isolate->builtins()->OnStackReplacement()->entry()));
|
| + return ON_STACK_REPLACEMENT;
|
| }
|
|
|
|
|
|
|