| Index: src/arm/lithium-codegen-arm.cc
|
| diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc
|
| index 86be095d1581809f9ceeb050bec721ae193946c7..0e47f7797f83ca0d67fed1ee61787f76982e618b 100644
|
| --- a/src/arm/lithium-codegen-arm.cc
|
| +++ b/src/arm/lithium-codegen-arm.cc
|
| @@ -3836,6 +3836,7 @@ void LCodeGen::DoSmiUntag(LSmiUntag* instr) {
|
|
|
| void LCodeGen::EmitNumberUntagD(Register input_reg,
|
| DoubleRegister result_reg,
|
| + bool deoptimize_on_undefined,
|
| LEnvironment* env) {
|
| Register scratch = scratch0();
|
| SwVfpRegister flt_scratch = s0;
|
| @@ -3851,20 +3852,25 @@ void LCodeGen::EmitNumberUntagD(Register input_reg,
|
| __ ldr(scratch, FieldMemOperand(input_reg, HeapObject::kMapOffset));
|
| __ LoadRoot(ip, Heap::kHeapNumberMapRootIndex);
|
| __ cmp(scratch, Operand(ip));
|
| - __ b(eq, &heap_number);
|
| + if (deoptimize_on_undefined) {
|
| + DeoptimizeIf(ne, env);
|
| + } else {
|
| + Label heap_number;
|
| + __ b(eq, &heap_number);
|
|
|
| - __ LoadRoot(ip, Heap::kUndefinedValueRootIndex);
|
| - __ cmp(input_reg, Operand(ip));
|
| - DeoptimizeIf(ne, env);
|
| + __ LoadRoot(ip, Heap::kUndefinedValueRootIndex);
|
| + __ cmp(input_reg, Operand(ip));
|
| + DeoptimizeIf(ne, env);
|
|
|
| - // Convert undefined to NaN.
|
| - __ LoadRoot(ip, Heap::kNanValueRootIndex);
|
| - __ sub(ip, ip, Operand(kHeapObjectTag));
|
| - __ vldr(result_reg, ip, HeapNumber::kValueOffset);
|
| - __ jmp(&done);
|
| + // Convert undefined to NaN.
|
| + __ LoadRoot(ip, Heap::kNanValueRootIndex);
|
| + __ sub(ip, ip, Operand(kHeapObjectTag));
|
| + __ vldr(result_reg, ip, HeapNumber::kValueOffset);
|
| + __ jmp(&done);
|
|
|
| + __ bind(&heap_number);
|
| + }
|
| // Heap number to double register conversion.
|
| - __ bind(&heap_number);
|
| __ sub(ip, input_reg, Operand(kHeapObjectTag));
|
| __ vldr(result_reg, ip, HeapNumber::kValueOffset);
|
| __ jmp(&done);
|
| @@ -3998,7 +4004,9 @@ void LCodeGen::DoNumberUntagD(LNumberUntagD* instr) {
|
| Register input_reg = ToRegister(input);
|
| DoubleRegister result_reg = ToDoubleRegister(result);
|
|
|
| - EmitNumberUntagD(input_reg, result_reg, instr->environment());
|
| + EmitNumberUntagD(input_reg, result_reg,
|
| + inst->deoptimize_on_undefined(),
|
| + instr->environment());
|
| }
|
|
|
|
|
|
|