| Index: src/arm/lithium-codegen-arm.cc
|
| diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc
|
| index 38015b4fe442dbaac45f0590ba3db1e4ef0df0dc..fc59839ea07c45422eae2216717fe7c0cb81219b 100644
|
| --- a/src/arm/lithium-codegen-arm.cc
|
| +++ b/src/arm/lithium-codegen-arm.cc
|
| @@ -818,8 +818,7 @@ void LCodeGen::DeoptimizeIf(Condition cc, LEnvironment* environment) {
|
|
|
| ASSERT(FLAG_deopt_every_n_times < 2); // Other values not supported on ARM.
|
|
|
| - if (FLAG_deopt_every_n_times == 1 &&
|
| - info_->shared_info()->opt_count() == id) {
|
| + if (FLAG_deopt_every_n_times == 1 && info_->opt_count() == id) {
|
| __ Jump(entry, RelocInfo::RUNTIME_ENTRY);
|
| return;
|
| }
|
| @@ -4508,8 +4507,8 @@ void LCodeGen::DoTransitionElementsKind(LTransitionElementsKind* instr) {
|
|
|
| Handle<Map> from_map = instr->original_map();
|
| Handle<Map> to_map = instr->transitioned_map();
|
| - ElementsKind from_kind = from_map->elements_kind();
|
| - ElementsKind to_kind = to_map->elements_kind();
|
| + ElementsKind from_kind = instr->from_kind();
|
| + ElementsKind to_kind = instr->to_kind();
|
|
|
| Label not_applicable;
|
| __ ldr(scratch, FieldMemOperand(object_reg, HeapObject::kMapOffset));
|
|
|