| Index: src/arm/lithium-codegen-arm.cc
|
| diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc
|
| index 53660c5ff0de3fec4af6fcfc0544a46d155a6f0f..43cd263fc6bb81f20d5c64bb1c1973069eec843d 100644
|
| --- a/src/arm/lithium-codegen-arm.cc
|
| +++ b/src/arm/lithium-codegen-arm.cc
|
| @@ -4972,7 +4972,7 @@ void LCodeGen::DoSmiUntag(LSmiUntag* instr) {
|
|
|
| void LCodeGen::EmitNumberUntagD(Register input_reg,
|
| DwVfpRegister result_reg,
|
| - bool deoptimize_on_undefined,
|
| + bool allow_undefined_as_nan,
|
| bool deoptimize_on_minus_zero,
|
| LEnvironment* env,
|
| NumberUntagDMode mode) {
|
| @@ -4992,7 +4992,7 @@ void LCodeGen::EmitNumberUntagD(Register input_reg,
|
| __ ldr(scratch, FieldMemOperand(input_reg, HeapObject::kMapOffset));
|
| __ LoadRoot(ip, Heap::kHeapNumberMapRootIndex);
|
| __ cmp(scratch, Operand(ip));
|
| - if (deoptimize_on_undefined) {
|
| + if (!allow_undefined_as_nan) {
|
| DeoptimizeIf(ne, env);
|
| } else {
|
| Label heap_number, convert;
|
| @@ -5162,7 +5162,7 @@ void LCodeGen::DoNumberUntagD(LNumberUntagD* instr) {
|
| }
|
|
|
| EmitNumberUntagD(input_reg, result_reg,
|
| - instr->hydrogen()->deoptimize_on_undefined(),
|
| + instr->hydrogen()->allow_undefined_as_nan(),
|
| instr->hydrogen()->deoptimize_on_minus_zero(),
|
| instr->environment(),
|
| mode);
|
|
|