| Index: src/arm/lithium-codegen-arm.cc
|
| diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc
|
| index 1b12643fbc421f06b123b14ce2ef971f5597bf17..8388999dcd2a241f2e58ee96d23c74bcf9308ee6 100644
|
| --- a/src/arm/lithium-codegen-arm.cc
|
| +++ b/src/arm/lithium-codegen-arm.cc
|
| @@ -336,7 +336,7 @@ bool LCodeGen::GenerateJumpTable() {
|
|
|
| DCHECK_EQ(jump_table_[0].bailout_type, table_entry->bailout_type);
|
| Address entry = table_entry->address;
|
| - DeoptComment(table_entry->reason);
|
| + DeoptComment(table_entry->deopt_info);
|
|
|
| // Second-level deopt table entries are contiguous and small, so instead
|
| // of loading the full, absolute address of each one, load an immediate
|
| @@ -893,17 +893,17 @@ void LCodeGen::DeoptimizeIf(Condition condition, LInstruction* instr,
|
| __ stop("trap_on_deopt", condition);
|
| }
|
|
|
| - Deoptimizer::Reason reason(instr->hydrogen_value()->position().raw(),
|
| - instr->Mnemonic(), deopt_reason);
|
| + Deoptimizer::DeoptInfo deopt_info(instr->hydrogen_value()->position().raw(),
|
| + instr->Mnemonic(), deopt_reason);
|
| DCHECK(info()->IsStub() || frame_is_built_);
|
| // Go through jump table if we need to handle condition, build frame, or
|
| // restore caller doubles.
|
| if (condition == al && frame_is_built_ &&
|
| !info()->saves_caller_doubles()) {
|
| - DeoptComment(reason);
|
| + DeoptComment(deopt_info);
|
| __ Call(entry, RelocInfo::RUNTIME_ENTRY);
|
| } else {
|
| - Deoptimizer::JumpTableEntry table_entry(entry, reason, bailout_type,
|
| + Deoptimizer::JumpTableEntry table_entry(entry, deopt_info, bailout_type,
|
| !frame_is_built_);
|
| // We often have several deopts to the same entry, reuse the last
|
| // jump entry if this is the case.
|
|
|