| Index: src/ia32/lithium-codegen-ia32.cc
|
| diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc
|
| index a02d3ce1d281c3a5995172637dc0c2168575ce9c..8c056f77431730521f96a51edd2b7ec7036371e1 100644
|
| --- a/src/ia32/lithium-codegen-ia32.cc
|
| +++ b/src/ia32/lithium-codegen-ia32.cc
|
| @@ -5084,7 +5084,7 @@ void LCodeGen::DoSmiUntag(LSmiUntag* instr) {
|
|
|
| void LCodeGen::EmitNumberUntagDNoSSE2(Register input_reg,
|
| Register temp_reg,
|
| - bool deoptimize_on_undefined,
|
| + bool allow_undefined_as_nan,
|
| bool deoptimize_on_minus_zero,
|
| LEnvironment* env,
|
| NumberUntagDMode mode) {
|
| @@ -5099,7 +5099,7 @@ void LCodeGen::EmitNumberUntagDNoSSE2(Register input_reg,
|
| // Heap number map check.
|
| __ cmp(FieldOperand(input_reg, HeapObject::kMapOffset),
|
| factory()->heap_number_map());
|
| - if (deoptimize_on_undefined) {
|
| + if (!allow_undefined_as_nan) {
|
| DeoptimizeIf(not_equal, env);
|
| } else {
|
| Label heap_number, convert;
|
| @@ -5156,7 +5156,7 @@ void LCodeGen::EmitNumberUntagDNoSSE2(Register input_reg,
|
| void LCodeGen::EmitNumberUntagD(Register input_reg,
|
| Register temp_reg,
|
| XMMRegister result_reg,
|
| - bool deoptimize_on_undefined,
|
| + bool allow_undefined_as_nan,
|
| bool deoptimize_on_minus_zero,
|
| LEnvironment* env,
|
| NumberUntagDMode mode) {
|
| @@ -5171,7 +5171,7 @@ void LCodeGen::EmitNumberUntagD(Register input_reg,
|
| // Heap number map check.
|
| __ cmp(FieldOperand(input_reg, HeapObject::kMapOffset),
|
| factory()->heap_number_map());
|
| - if (deoptimize_on_undefined) {
|
| + if (!allow_undefined_as_nan) {
|
| DeoptimizeIf(not_equal, env);
|
| } else {
|
| Label heap_number, convert;
|
| @@ -5519,14 +5519,14 @@ void LCodeGen::DoNumberUntagD(LNumberUntagD* instr) {
|
| EmitNumberUntagD(input_reg,
|
| temp_reg,
|
| result_reg,
|
| - instr->hydrogen()->deoptimize_on_undefined(),
|
| + instr->hydrogen()->allow_undefined_as_nan(),
|
| deoptimize_on_minus_zero,
|
| instr->environment(),
|
| mode);
|
| } else {
|
| EmitNumberUntagDNoSSE2(input_reg,
|
| temp_reg,
|
| - instr->hydrogen()->deoptimize_on_undefined(),
|
| + instr->hydrogen()->allow_undefined_as_nan(),
|
| deoptimize_on_minus_zero,
|
| instr->environment(),
|
| mode);
|
|
|