Index: src/full-codegen/mips64/full-codegen-mips64.cc |
diff --git a/src/full-codegen/mips64/full-codegen-mips64.cc b/src/full-codegen/mips64/full-codegen-mips64.cc |
index 31b27ef98c4c6b8c6caa9a986eb2513eb26452b4..a8ff5f357a2f6b8eae2c021f6ee7a83fdee3c7dc 100644 |
--- a/src/full-codegen/mips64/full-codegen-mips64.cc |
+++ b/src/full-codegen/mips64/full-codegen-mips64.cc |
@@ -4135,7 +4135,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 |
@@ -4165,7 +4164,9 @@ BackEdgeTable::BackEdgeState BackEdgeTable::GetBackEdgeState( |
Address pc) { |
static const int kInstrSize = Assembler::kInstrSize; |
Address branch_address = pc - 8 * kInstrSize; |
+#ifdef DEBUG |
Address pc_immediate_load_address = pc - 6 * kInstrSize; |
+#endif |
DCHECK(Assembler::IsBeq(Assembler::instr_at(pc - 7 * kInstrSize))); |
if (!Assembler::IsAddImmediate(Assembler::instr_at(branch_address))) { |
@@ -4178,18 +4179,11 @@ BackEdgeTable::BackEdgeState BackEdgeTable::GetBackEdgeState( |
DCHECK(Assembler::IsAddImmediate(Assembler::instr_at(branch_address))); |
- if (reinterpret_cast<uint64_t>( |
- Assembler::target_address_at(pc_immediate_load_address)) == |
- reinterpret_cast<uint64_t>( |
- isolate->builtins()->OnStackReplacement()->entry())) { |
- return ON_STACK_REPLACEMENT; |
- } |
- |
DCHECK(reinterpret_cast<uint64_t>( |
- Assembler::target_address_at(pc_immediate_load_address)) == |
+ Assembler::target_address_at(pc_immediate_load_address)) == |
reinterpret_cast<uint64_t>( |
- isolate->builtins()->OsrAfterStackCheck()->entry())); |
- return OSR_AFTER_STACK_CHECK; |
+ isolate->builtins()->OnStackReplacement()->entry())); |
+ return ON_STACK_REPLACEMENT; |
} |