| Index: src/crankshaft/ia32/lithium-codegen-ia32.cc
|
| diff --git a/src/crankshaft/ia32/lithium-codegen-ia32.cc b/src/crankshaft/ia32/lithium-codegen-ia32.cc
|
| index d389b4b88d3c4fca23f83141168d526850c8480e..b6f9811a1410a88f0e56606f351d450f501e8560 100644
|
| --- a/src/crankshaft/ia32/lithium-codegen-ia32.cc
|
| +++ b/src/crankshaft/ia32/lithium-codegen-ia32.cc
|
| @@ -682,9 +682,8 @@ void LCodeGen::RegisterEnvironmentForDeoptimization(
|
| }
|
| }
|
|
|
| -
|
| void LCodeGen::DeoptimizeIf(Condition cc, LInstruction* instr,
|
| - Deoptimizer::DeoptReason deopt_reason,
|
| + DeoptimizeReason deopt_reason,
|
| Deoptimizer::BailoutType bailout_type) {
|
| LEnvironment* environment = instr->environment();
|
| RegisterEnvironmentForDeoptimization(environment, Safepoint::kNoLazyDeopt);
|
| @@ -749,9 +748,8 @@ void LCodeGen::DeoptimizeIf(Condition cc, LInstruction* instr,
|
| }
|
| }
|
|
|
| -
|
| void LCodeGen::DeoptimizeIf(Condition cc, LInstruction* instr,
|
| - Deoptimizer::DeoptReason deopt_reason) {
|
| + DeoptimizeReason deopt_reason) {
|
| Deoptimizer::BailoutType bailout_type = info()->IsStub()
|
| ? Deoptimizer::LAZY
|
| : Deoptimizer::EAGER;
|
| @@ -882,7 +880,7 @@ void LCodeGen::DoModByPowerOf2I(LModByPowerOf2I* instr) {
|
| __ and_(dividend, mask);
|
| __ neg(dividend);
|
| if (hmod->CheckFlag(HValue::kBailoutOnMinusZero)) {
|
| - DeoptimizeIf(zero, instr, Deoptimizer::kMinusZero);
|
| + DeoptimizeIf(zero, instr, DeoptimizeReason::kMinusZero);
|
| }
|
| __ jmp(&done, Label::kNear);
|
| }
|
| @@ -899,7 +897,7 @@ void LCodeGen::DoModByConstI(LModByConstI* instr) {
|
| DCHECK(ToRegister(instr->result()).is(eax));
|
|
|
| if (divisor == 0) {
|
| - DeoptimizeIf(no_condition, instr, Deoptimizer::kDivisionByZero);
|
| + DeoptimizeIf(no_condition, instr, DeoptimizeReason::kDivisionByZero);
|
| return;
|
| }
|
|
|
| @@ -914,7 +912,7 @@ void LCodeGen::DoModByConstI(LModByConstI* instr) {
|
| Label remainder_not_zero;
|
| __ j(not_zero, &remainder_not_zero, Label::kNear);
|
| __ cmp(dividend, Immediate(0));
|
| - DeoptimizeIf(less, instr, Deoptimizer::kMinusZero);
|
| + DeoptimizeIf(less, instr, DeoptimizeReason::kMinusZero);
|
| __ bind(&remainder_not_zero);
|
| }
|
| }
|
| @@ -936,7 +934,7 @@ void LCodeGen::DoModI(LModI* instr) {
|
| // deopt in this case because we can't return a NaN.
|
| if (hmod->CheckFlag(HValue::kCanBeDivByZero)) {
|
| __ test(right_reg, Operand(right_reg));
|
| - DeoptimizeIf(zero, instr, Deoptimizer::kDivisionByZero);
|
| + DeoptimizeIf(zero, instr, DeoptimizeReason::kDivisionByZero);
|
| }
|
|
|
| // Check for kMinInt % -1, idiv would signal a divide error. We
|
| @@ -947,7 +945,7 @@ void LCodeGen::DoModI(LModI* instr) {
|
| __ j(not_equal, &no_overflow_possible, Label::kNear);
|
| __ cmp(right_reg, -1);
|
| if (hmod->CheckFlag(HValue::kBailoutOnMinusZero)) {
|
| - DeoptimizeIf(equal, instr, Deoptimizer::kMinusZero);
|
| + DeoptimizeIf(equal, instr, DeoptimizeReason::kMinusZero);
|
| } else {
|
| __ j(not_equal, &no_overflow_possible, Label::kNear);
|
| __ Move(result_reg, Immediate(0));
|
| @@ -966,7 +964,7 @@ void LCodeGen::DoModI(LModI* instr) {
|
| __ j(not_sign, &positive_left, Label::kNear);
|
| __ idiv(right_reg);
|
| __ test(result_reg, Operand(result_reg));
|
| - DeoptimizeIf(zero, instr, Deoptimizer::kMinusZero);
|
| + DeoptimizeIf(zero, instr, DeoptimizeReason::kMinusZero);
|
| __ jmp(&done, Label::kNear);
|
| __ bind(&positive_left);
|
| }
|
| @@ -986,19 +984,19 @@ void LCodeGen::DoDivByPowerOf2I(LDivByPowerOf2I* instr) {
|
| HDiv* hdiv = instr->hydrogen();
|
| if (hdiv->CheckFlag(HValue::kBailoutOnMinusZero) && divisor < 0) {
|
| __ test(dividend, dividend);
|
| - DeoptimizeIf(zero, instr, Deoptimizer::kMinusZero);
|
| + DeoptimizeIf(zero, instr, DeoptimizeReason::kMinusZero);
|
| }
|
| // Check for (kMinInt / -1).
|
| if (hdiv->CheckFlag(HValue::kCanOverflow) && divisor == -1) {
|
| __ cmp(dividend, kMinInt);
|
| - DeoptimizeIf(zero, instr, Deoptimizer::kOverflow);
|
| + DeoptimizeIf(zero, instr, DeoptimizeReason::kOverflow);
|
| }
|
| // Deoptimize if remainder will not be 0.
|
| if (!hdiv->CheckFlag(HInstruction::kAllUsesTruncatingToInt32) &&
|
| divisor != 1 && divisor != -1) {
|
| int32_t mask = divisor < 0 ? -(divisor + 1) : (divisor - 1);
|
| __ test(dividend, Immediate(mask));
|
| - DeoptimizeIf(not_zero, instr, Deoptimizer::kLostPrecision);
|
| + DeoptimizeIf(not_zero, instr, DeoptimizeReason::kLostPrecision);
|
| }
|
| __ Move(result, dividend);
|
| int32_t shift = WhichPowerOf2Abs(divisor);
|
| @@ -1019,7 +1017,7 @@ void LCodeGen::DoDivByConstI(LDivByConstI* instr) {
|
| DCHECK(ToRegister(instr->result()).is(edx));
|
|
|
| if (divisor == 0) {
|
| - DeoptimizeIf(no_condition, instr, Deoptimizer::kDivisionByZero);
|
| + DeoptimizeIf(no_condition, instr, DeoptimizeReason::kDivisionByZero);
|
| return;
|
| }
|
|
|
| @@ -1027,7 +1025,7 @@ void LCodeGen::DoDivByConstI(LDivByConstI* instr) {
|
| HDiv* hdiv = instr->hydrogen();
|
| if (hdiv->CheckFlag(HValue::kBailoutOnMinusZero) && divisor < 0) {
|
| __ test(dividend, dividend);
|
| - DeoptimizeIf(zero, instr, Deoptimizer::kMinusZero);
|
| + DeoptimizeIf(zero, instr, DeoptimizeReason::kMinusZero);
|
| }
|
|
|
| __ TruncatingDiv(dividend, Abs(divisor));
|
| @@ -1037,7 +1035,7 @@ void LCodeGen::DoDivByConstI(LDivByConstI* instr) {
|
| __ mov(eax, edx);
|
| __ imul(eax, eax, divisor);
|
| __ sub(eax, dividend);
|
| - DeoptimizeIf(not_equal, instr, Deoptimizer::kLostPrecision);
|
| + DeoptimizeIf(not_equal, instr, DeoptimizeReason::kLostPrecision);
|
| }
|
| }
|
|
|
| @@ -1057,7 +1055,7 @@ void LCodeGen::DoDivI(LDivI* instr) {
|
| // Check for x / 0.
|
| if (hdiv->CheckFlag(HValue::kCanBeDivByZero)) {
|
| __ test(divisor, divisor);
|
| - DeoptimizeIf(zero, instr, Deoptimizer::kDivisionByZero);
|
| + DeoptimizeIf(zero, instr, DeoptimizeReason::kDivisionByZero);
|
| }
|
|
|
| // Check for (0 / -x) that will produce negative zero.
|
| @@ -1066,7 +1064,7 @@ void LCodeGen::DoDivI(LDivI* instr) {
|
| __ test(dividend, dividend);
|
| __ j(not_zero, ÷nd_not_zero, Label::kNear);
|
| __ test(divisor, divisor);
|
| - DeoptimizeIf(sign, instr, Deoptimizer::kMinusZero);
|
| + DeoptimizeIf(sign, instr, DeoptimizeReason::kMinusZero);
|
| __ bind(÷nd_not_zero);
|
| }
|
|
|
| @@ -1076,7 +1074,7 @@ void LCodeGen::DoDivI(LDivI* instr) {
|
| __ cmp(dividend, kMinInt);
|
| __ j(not_zero, ÷nd_not_min_int, Label::kNear);
|
| __ cmp(divisor, -1);
|
| - DeoptimizeIf(zero, instr, Deoptimizer::kOverflow);
|
| + DeoptimizeIf(zero, instr, DeoptimizeReason::kOverflow);
|
| __ bind(÷nd_not_min_int);
|
| }
|
|
|
| @@ -1087,7 +1085,7 @@ void LCodeGen::DoDivI(LDivI* instr) {
|
| if (!hdiv->CheckFlag(HValue::kAllUsesTruncatingToInt32)) {
|
| // Deoptimize if remainder is not 0.
|
| __ test(remainder, remainder);
|
| - DeoptimizeIf(not_zero, instr, Deoptimizer::kLostPrecision);
|
| + DeoptimizeIf(not_zero, instr, DeoptimizeReason::kLostPrecision);
|
| }
|
| }
|
|
|
| @@ -1109,13 +1107,13 @@ void LCodeGen::DoFlooringDivByPowerOf2I(LFlooringDivByPowerOf2I* instr) {
|
| // If the divisor is negative, we have to negate and handle edge cases.
|
| __ neg(dividend);
|
| if (instr->hydrogen()->CheckFlag(HValue::kBailoutOnMinusZero)) {
|
| - DeoptimizeIf(zero, instr, Deoptimizer::kMinusZero);
|
| + DeoptimizeIf(zero, instr, DeoptimizeReason::kMinusZero);
|
| }
|
|
|
| // Dividing by -1 is basically negation, unless we overflow.
|
| if (divisor == -1) {
|
| if (instr->hydrogen()->CheckFlag(HValue::kLeftCanBeMinInt)) {
|
| - DeoptimizeIf(overflow, instr, Deoptimizer::kOverflow);
|
| + DeoptimizeIf(overflow, instr, DeoptimizeReason::kOverflow);
|
| }
|
| return;
|
| }
|
| @@ -1142,7 +1140,7 @@ void LCodeGen::DoFlooringDivByConstI(LFlooringDivByConstI* instr) {
|
| DCHECK(ToRegister(instr->result()).is(edx));
|
|
|
| if (divisor == 0) {
|
| - DeoptimizeIf(no_condition, instr, Deoptimizer::kDivisionByZero);
|
| + DeoptimizeIf(no_condition, instr, DeoptimizeReason::kDivisionByZero);
|
| return;
|
| }
|
|
|
| @@ -1150,7 +1148,7 @@ void LCodeGen::DoFlooringDivByConstI(LFlooringDivByConstI* instr) {
|
| HMathFloorOfDiv* hdiv = instr->hydrogen();
|
| if (hdiv->CheckFlag(HValue::kBailoutOnMinusZero) && divisor < 0) {
|
| __ test(dividend, dividend);
|
| - DeoptimizeIf(zero, instr, Deoptimizer::kMinusZero);
|
| + DeoptimizeIf(zero, instr, DeoptimizeReason::kMinusZero);
|
| }
|
|
|
| // Easy case: We need no dynamic check for the dividend and the flooring
|
| @@ -1197,7 +1195,7 @@ void LCodeGen::DoFlooringDivI(LFlooringDivI* instr) {
|
| // Check for x / 0.
|
| if (hdiv->CheckFlag(HValue::kCanBeDivByZero)) {
|
| __ test(divisor, divisor);
|
| - DeoptimizeIf(zero, instr, Deoptimizer::kDivisionByZero);
|
| + DeoptimizeIf(zero, instr, DeoptimizeReason::kDivisionByZero);
|
| }
|
|
|
| // Check for (0 / -x) that will produce negative zero.
|
| @@ -1206,7 +1204,7 @@ void LCodeGen::DoFlooringDivI(LFlooringDivI* instr) {
|
| __ test(dividend, dividend);
|
| __ j(not_zero, ÷nd_not_zero, Label::kNear);
|
| __ test(divisor, divisor);
|
| - DeoptimizeIf(sign, instr, Deoptimizer::kMinusZero);
|
| + DeoptimizeIf(sign, instr, DeoptimizeReason::kMinusZero);
|
| __ bind(÷nd_not_zero);
|
| }
|
|
|
| @@ -1216,7 +1214,7 @@ void LCodeGen::DoFlooringDivI(LFlooringDivI* instr) {
|
| __ cmp(dividend, kMinInt);
|
| __ j(not_zero, ÷nd_not_min_int, Label::kNear);
|
| __ cmp(divisor, -1);
|
| - DeoptimizeIf(zero, instr, Deoptimizer::kOverflow);
|
| + DeoptimizeIf(zero, instr, DeoptimizeReason::kOverflow);
|
| __ bind(÷nd_not_min_int);
|
| }
|
|
|
| @@ -1294,7 +1292,7 @@ void LCodeGen::DoMulI(LMulI* instr) {
|
| }
|
|
|
| if (instr->hydrogen()->CheckFlag(HValue::kCanOverflow)) {
|
| - DeoptimizeIf(overflow, instr, Deoptimizer::kOverflow);
|
| + DeoptimizeIf(overflow, instr, DeoptimizeReason::kOverflow);
|
| }
|
|
|
| if (instr->hydrogen()->CheckFlag(HValue::kBailoutOnMinusZero)) {
|
| @@ -1304,15 +1302,15 @@ void LCodeGen::DoMulI(LMulI* instr) {
|
| __ j(not_zero, &done, Label::kNear);
|
| if (right->IsConstantOperand()) {
|
| if (ToInteger32(LConstantOperand::cast(right)) < 0) {
|
| - DeoptimizeIf(no_condition, instr, Deoptimizer::kMinusZero);
|
| + DeoptimizeIf(no_condition, instr, DeoptimizeReason::kMinusZero);
|
| } else if (ToInteger32(LConstantOperand::cast(right)) == 0) {
|
| __ cmp(ToRegister(instr->temp()), Immediate(0));
|
| - DeoptimizeIf(less, instr, Deoptimizer::kMinusZero);
|
| + DeoptimizeIf(less, instr, DeoptimizeReason::kMinusZero);
|
| }
|
| } else {
|
| // Test the non-zero operand for negative sign.
|
| __ or_(ToRegister(instr->temp()), ToOperand(right));
|
| - DeoptimizeIf(sign, instr, Deoptimizer::kMinusZero);
|
| + DeoptimizeIf(sign, instr, DeoptimizeReason::kMinusZero);
|
| }
|
| __ bind(&done);
|
| }
|
| @@ -1385,7 +1383,7 @@ void LCodeGen::DoShiftI(LShiftI* instr) {
|
| __ shr_cl(ToRegister(left));
|
| if (instr->can_deopt()) {
|
| __ test(ToRegister(left), ToRegister(left));
|
| - DeoptimizeIf(sign, instr, Deoptimizer::kNegativeValue);
|
| + DeoptimizeIf(sign, instr, DeoptimizeReason::kNegativeValue);
|
| }
|
| break;
|
| case Token::SHL:
|
| @@ -1402,7 +1400,7 @@ void LCodeGen::DoShiftI(LShiftI* instr) {
|
| case Token::ROR:
|
| if (shift_count == 0 && instr->can_deopt()) {
|
| __ test(ToRegister(left), ToRegister(left));
|
| - DeoptimizeIf(sign, instr, Deoptimizer::kNegativeValue);
|
| + DeoptimizeIf(sign, instr, DeoptimizeReason::kNegativeValue);
|
| } else {
|
| __ ror(ToRegister(left), shift_count);
|
| }
|
| @@ -1417,7 +1415,7 @@ void LCodeGen::DoShiftI(LShiftI* instr) {
|
| __ shr(ToRegister(left), shift_count);
|
| } else if (instr->can_deopt()) {
|
| __ test(ToRegister(left), ToRegister(left));
|
| - DeoptimizeIf(sign, instr, Deoptimizer::kNegativeValue);
|
| + DeoptimizeIf(sign, instr, DeoptimizeReason::kNegativeValue);
|
| }
|
| break;
|
| case Token::SHL:
|
| @@ -1428,7 +1426,7 @@ void LCodeGen::DoShiftI(LShiftI* instr) {
|
| __ shl(ToRegister(left), shift_count - 1);
|
| }
|
| __ SmiTag(ToRegister(left));
|
| - DeoptimizeIf(overflow, instr, Deoptimizer::kOverflow);
|
| + DeoptimizeIf(overflow, instr, DeoptimizeReason::kOverflow);
|
| } else {
|
| __ shl(ToRegister(left), shift_count);
|
| }
|
| @@ -1454,7 +1452,7 @@ void LCodeGen::DoSubI(LSubI* instr) {
|
| __ sub(ToRegister(left), ToOperand(right));
|
| }
|
| if (instr->hydrogen()->CheckFlag(HValue::kCanOverflow)) {
|
| - DeoptimizeIf(overflow, instr, Deoptimizer::kOverflow);
|
| + DeoptimizeIf(overflow, instr, DeoptimizeReason::kOverflow);
|
| }
|
| }
|
|
|
| @@ -1626,7 +1624,7 @@ void LCodeGen::DoAddI(LAddI* instr) {
|
| __ add(ToRegister(left), ToOperand(right));
|
| }
|
| if (instr->hydrogen()->CheckFlag(HValue::kCanOverflow)) {
|
| - DeoptimizeIf(overflow, instr, Deoptimizer::kOverflow);
|
| + DeoptimizeIf(overflow, instr, DeoptimizeReason::kOverflow);
|
| }
|
| }
|
| }
|
| @@ -1885,7 +1883,7 @@ void LCodeGen::DoBranch(LBranch* instr) {
|
| } else if (expected.NeedsMap()) {
|
| // If we need a map later and have a Smi -> deopt.
|
| __ test(reg, Immediate(kSmiTagMask));
|
| - DeoptimizeIf(zero, instr, Deoptimizer::kSmi);
|
| + DeoptimizeIf(zero, instr, DeoptimizeReason::kSmi);
|
| }
|
|
|
| Register map = no_reg; // Keep the compiler happy.
|
| @@ -1948,7 +1946,7 @@ void LCodeGen::DoBranch(LBranch* instr) {
|
| if (!expected.IsGeneric()) {
|
| // We've seen something for the first time -> deopt.
|
| // This can only happen if we are not generic already.
|
| - DeoptimizeIf(no_condition, instr, Deoptimizer::kUnexpectedObject);
|
| + DeoptimizeIf(no_condition, instr, DeoptimizeReason::kUnexpectedObject);
|
| }
|
| }
|
| }
|
| @@ -2306,10 +2304,10 @@ void LCodeGen::DoHasInPrototypeChainAndBranch(
|
| // Deoptimize if the object needs to be access checked.
|
| __ test_b(FieldOperand(object_map, Map::kBitFieldOffset),
|
| Immediate(1 << Map::kIsAccessCheckNeeded));
|
| - DeoptimizeIf(not_zero, instr, Deoptimizer::kAccessCheck);
|
| + DeoptimizeIf(not_zero, instr, DeoptimizeReason::kAccessCheck);
|
| // Deoptimize for proxies.
|
| __ CmpInstanceType(object_map, JS_PROXY_TYPE);
|
| - DeoptimizeIf(equal, instr, Deoptimizer::kProxy);
|
| + DeoptimizeIf(equal, instr, DeoptimizeReason::kProxy);
|
|
|
| __ mov(object_prototype, FieldOperand(object_map, Map::kPrototypeOffset));
|
| __ cmp(object_prototype, factory()->null_value());
|
| @@ -2431,7 +2429,7 @@ void LCodeGen::DoLoadContextSlot(LLoadContextSlot* instr) {
|
| if (instr->hydrogen()->RequiresHoleCheck()) {
|
| __ cmp(result, factory()->the_hole_value());
|
| if (instr->hydrogen()->DeoptimizesOnHole()) {
|
| - DeoptimizeIf(equal, instr, Deoptimizer::kHole);
|
| + DeoptimizeIf(equal, instr, DeoptimizeReason::kHole);
|
| } else {
|
| Label is_not_hole;
|
| __ j(not_equal, &is_not_hole, Label::kNear);
|
| @@ -2452,7 +2450,7 @@ void LCodeGen::DoStoreContextSlot(LStoreContextSlot* instr) {
|
| if (instr->hydrogen()->RequiresHoleCheck()) {
|
| __ cmp(target, factory()->the_hole_value());
|
| if (instr->hydrogen()->DeoptimizesOnHole()) {
|
| - DeoptimizeIf(equal, instr, Deoptimizer::kHole);
|
| + DeoptimizeIf(equal, instr, DeoptimizeReason::kHole);
|
| } else {
|
| __ j(not_equal, &skip_assignment, Label::kNear);
|
| }
|
| @@ -2549,7 +2547,7 @@ void LCodeGen::DoLoadFunctionPrototype(LLoadFunctionPrototype* instr) {
|
|
|
| // Check that the function has a prototype or an initial map.
|
| __ cmp(Operand(result), Immediate(factory()->the_hole_value()));
|
| - DeoptimizeIf(equal, instr, Deoptimizer::kHole);
|
| + DeoptimizeIf(equal, instr, DeoptimizeReason::kHole);
|
|
|
| // If the function does not have an initial map, we're done.
|
| Label done;
|
| @@ -2633,7 +2631,7 @@ void LCodeGen::DoLoadKeyedExternalArray(LLoadKeyed* instr) {
|
| __ mov(result, operand);
|
| if (!instr->hydrogen()->CheckFlag(HInstruction::kUint32)) {
|
| __ test(result, Operand(result));
|
| - DeoptimizeIf(negative, instr, Deoptimizer::kNegativeValue);
|
| + DeoptimizeIf(negative, instr, DeoptimizeReason::kNegativeValue);
|
| }
|
| break;
|
| case FLOAT32_ELEMENTS:
|
| @@ -2665,7 +2663,7 @@ void LCodeGen::DoLoadKeyedFixedDoubleArray(LLoadKeyed* instr) {
|
| FAST_DOUBLE_ELEMENTS,
|
| instr->base_offset() + sizeof(kHoleNanLower32));
|
| __ cmp(hole_check_operand, Immediate(kHoleNanUpper32));
|
| - DeoptimizeIf(equal, instr, Deoptimizer::kHole);
|
| + DeoptimizeIf(equal, instr, DeoptimizeReason::kHole);
|
| }
|
|
|
| Operand double_load_operand = BuildFastArrayOperand(
|
| @@ -2692,10 +2690,10 @@ void LCodeGen::DoLoadKeyedFixedArray(LLoadKeyed* instr) {
|
| if (instr->hydrogen()->RequiresHoleCheck()) {
|
| if (IsFastSmiElementsKind(instr->hydrogen()->elements_kind())) {
|
| __ test(result, Immediate(kSmiTagMask));
|
| - DeoptimizeIf(not_equal, instr, Deoptimizer::kNotASmi);
|
| + DeoptimizeIf(not_equal, instr, DeoptimizeReason::kNotASmi);
|
| } else {
|
| __ cmp(result, factory()->the_hole_value());
|
| - DeoptimizeIf(equal, instr, Deoptimizer::kHole);
|
| + DeoptimizeIf(equal, instr, DeoptimizeReason::kHole);
|
| }
|
| } else if (instr->hydrogen()->hole_mode() == CONVERT_HOLE_TO_UNDEFINED) {
|
| DCHECK(instr->hydrogen()->elements_kind() == FAST_HOLEY_ELEMENTS);
|
| @@ -2709,7 +2707,7 @@ void LCodeGen::DoLoadKeyedFixedArray(LLoadKeyed* instr) {
|
| __ LoadRoot(result, Heap::kArrayProtectorRootIndex);
|
| __ cmp(FieldOperand(result, PropertyCell::kValueOffset),
|
| Immediate(Smi::FromInt(Isolate::kArrayProtectorValid)));
|
| - DeoptimizeIf(not_equal, instr, Deoptimizer::kHole);
|
| + DeoptimizeIf(not_equal, instr, DeoptimizeReason::kHole);
|
| }
|
| __ mov(result, isolate()->factory()->undefined_value());
|
| __ bind(&done);
|
| @@ -2859,9 +2857,9 @@ void LCodeGen::DoWrapReceiver(LWrapReceiver* instr) {
|
|
|
| // The receiver should be a JS object.
|
| __ test(receiver, Immediate(kSmiTagMask));
|
| - DeoptimizeIf(equal, instr, Deoptimizer::kSmi);
|
| + DeoptimizeIf(equal, instr, DeoptimizeReason::kSmi);
|
| __ CmpObjectType(receiver, FIRST_JS_RECEIVER_TYPE, scratch);
|
| - DeoptimizeIf(below, instr, Deoptimizer::kNotAJavaScriptObject);
|
| + DeoptimizeIf(below, instr, DeoptimizeReason::kNotAJavaScriptObject);
|
|
|
| __ jmp(&receiver_ok, Label::kNear);
|
| __ bind(&global_object);
|
| @@ -2885,7 +2883,7 @@ void LCodeGen::DoApplyArguments(LApplyArguments* instr) {
|
| // adaptor frame below it.
|
| const uint32_t kArgumentsLimit = 1 * KB;
|
| __ cmp(length, kArgumentsLimit);
|
| - DeoptimizeIf(above, instr, Deoptimizer::kTooManyArguments);
|
| + DeoptimizeIf(above, instr, DeoptimizeReason::kTooManyArguments);
|
|
|
| __ push(receiver);
|
| __ mov(receiver, length);
|
| @@ -3061,7 +3059,7 @@ void LCodeGen::DoDeferredMathAbsTaggedHeapNumber(LMathAbs* instr) {
|
| Register input_reg = ToRegister(instr->value());
|
| __ cmp(FieldOperand(input_reg, HeapObject::kMapOffset),
|
| factory()->heap_number_map());
|
| - DeoptimizeIf(not_equal, instr, Deoptimizer::kNotAHeapNumber);
|
| + DeoptimizeIf(not_equal, instr, DeoptimizeReason::kNotAHeapNumber);
|
|
|
| Label slow, allocated, done;
|
| uint32_t available_regs = eax.bit() | ecx.bit() | edx.bit() | ebx.bit();
|
| @@ -3119,7 +3117,7 @@ void LCodeGen::EmitIntegerMathAbs(LMathAbs* instr) {
|
| Label is_positive;
|
| __ j(not_sign, &is_positive, Label::kNear);
|
| __ neg(input_reg); // Sets flags.
|
| - DeoptimizeIf(negative, instr, Deoptimizer::kOverflow);
|
| + DeoptimizeIf(negative, instr, DeoptimizeReason::kOverflow);
|
| __ bind(&is_positive);
|
| }
|
|
|
| @@ -3184,20 +3182,20 @@ void LCodeGen::DoMathFloorI(LMathFloorI* instr) {
|
| __ j(not_equal, &non_zero, Label::kNear);
|
| __ movmskpd(output_reg, input_reg);
|
| __ test(output_reg, Immediate(1));
|
| - DeoptimizeIf(not_zero, instr, Deoptimizer::kMinusZero);
|
| + DeoptimizeIf(not_zero, instr, DeoptimizeReason::kMinusZero);
|
| __ bind(&non_zero);
|
| }
|
| __ roundsd(xmm_scratch, input_reg, kRoundDown);
|
| __ cvttsd2si(output_reg, Operand(xmm_scratch));
|
| // Overflow is signalled with minint.
|
| __ cmp(output_reg, 0x1);
|
| - DeoptimizeIf(overflow, instr, Deoptimizer::kOverflow);
|
| + DeoptimizeIf(overflow, instr, DeoptimizeReason::kOverflow);
|
| } else {
|
| Label negative_sign, done;
|
| // Deoptimize on unordered.
|
| __ xorps(xmm_scratch, xmm_scratch); // Zero the register.
|
| __ ucomisd(input_reg, xmm_scratch);
|
| - DeoptimizeIf(parity_even, instr, Deoptimizer::kNaN);
|
| + DeoptimizeIf(parity_even, instr, DeoptimizeReason::kNaN);
|
| __ j(below, &negative_sign, Label::kNear);
|
|
|
| if (instr->hydrogen()->CheckFlag(HValue::kBailoutOnMinusZero)) {
|
| @@ -3206,7 +3204,7 @@ void LCodeGen::DoMathFloorI(LMathFloorI* instr) {
|
| __ j(above, &positive_sign, Label::kNear);
|
| __ movmskpd(output_reg, input_reg);
|
| __ test(output_reg, Immediate(1));
|
| - DeoptimizeIf(not_zero, instr, Deoptimizer::kMinusZero);
|
| + DeoptimizeIf(not_zero, instr, DeoptimizeReason::kMinusZero);
|
| __ Move(output_reg, Immediate(0));
|
| __ jmp(&done, Label::kNear);
|
| __ bind(&positive_sign);
|
| @@ -3216,7 +3214,7 @@ void LCodeGen::DoMathFloorI(LMathFloorI* instr) {
|
| __ cvttsd2si(output_reg, Operand(input_reg));
|
| // Overflow is signalled with minint.
|
| __ cmp(output_reg, 0x1);
|
| - DeoptimizeIf(overflow, instr, Deoptimizer::kOverflow);
|
| + DeoptimizeIf(overflow, instr, DeoptimizeReason::kOverflow);
|
| __ jmp(&done, Label::kNear);
|
|
|
| // Non-zero negative reaches here.
|
| @@ -3227,7 +3225,7 @@ void LCodeGen::DoMathFloorI(LMathFloorI* instr) {
|
| __ ucomisd(input_reg, xmm_scratch);
|
| __ j(equal, &done, Label::kNear);
|
| __ sub(output_reg, Immediate(1));
|
| - DeoptimizeIf(overflow, instr, Deoptimizer::kOverflow);
|
| + DeoptimizeIf(overflow, instr, DeoptimizeReason::kOverflow);
|
|
|
| __ bind(&done);
|
| }
|
| @@ -3270,7 +3268,7 @@ void LCodeGen::DoMathRoundI(LMathRoundI* instr) {
|
| __ cvttsd2si(output_reg, Operand(xmm_scratch));
|
| // Overflow is signalled with minint.
|
| __ cmp(output_reg, 0x1);
|
| - DeoptimizeIf(overflow, instr, Deoptimizer::kOverflow);
|
| + DeoptimizeIf(overflow, instr, DeoptimizeReason::kOverflow);
|
| __ jmp(&done, dist);
|
|
|
| __ bind(&below_one_half);
|
| @@ -3285,7 +3283,7 @@ void LCodeGen::DoMathRoundI(LMathRoundI* instr) {
|
| __ cvttsd2si(output_reg, Operand(input_temp));
|
| // Catch minint due to overflow, and to prevent overflow when compensating.
|
| __ cmp(output_reg, 0x1);
|
| - DeoptimizeIf(overflow, instr, Deoptimizer::kOverflow);
|
| + DeoptimizeIf(overflow, instr, DeoptimizeReason::kOverflow);
|
|
|
| __ Cvtsi2sd(xmm_scratch, output_reg);
|
| __ ucomisd(xmm_scratch, input_temp);
|
| @@ -3301,7 +3299,7 @@ void LCodeGen::DoMathRoundI(LMathRoundI* instr) {
|
| // If the sign is positive, we return +0.
|
| __ movmskpd(output_reg, input_reg);
|
| __ test(output_reg, Immediate(1));
|
| - DeoptimizeIf(not_zero, instr, Deoptimizer::kMinusZero);
|
| + DeoptimizeIf(not_zero, instr, DeoptimizeReason::kMinusZero);
|
| }
|
| __ Move(output_reg, Immediate(0));
|
| __ bind(&done);
|
| @@ -3377,7 +3375,7 @@ void LCodeGen::DoPower(LPower* instr) {
|
| __ JumpIfSmi(tagged_exponent, &no_deopt);
|
| DCHECK(!ecx.is(tagged_exponent));
|
| __ CmpObjectType(tagged_exponent, HEAP_NUMBER_TYPE, ecx);
|
| - DeoptimizeIf(not_equal, instr, Deoptimizer::kNotAHeapNumber);
|
| + DeoptimizeIf(not_equal, instr, DeoptimizeReason::kNotAHeapNumber);
|
| __ bind(&no_deopt);
|
| MathPowStub stub(isolate(), MathPowStub::TAGGED);
|
| __ CallStub(&stub);
|
| @@ -3738,7 +3736,7 @@ void LCodeGen::DoBoundsCheck(LBoundsCheck* instr) {
|
| __ int3();
|
| __ bind(&done);
|
| } else {
|
| - DeoptimizeIf(cc, instr, Deoptimizer::kOutOfBounds);
|
| + DeoptimizeIf(cc, instr, DeoptimizeReason::kOutOfBounds);
|
| }
|
| }
|
|
|
| @@ -3897,7 +3895,7 @@ void LCodeGen::DoTrapAllocationMemento(LTrapAllocationMemento* instr) {
|
| Register temp = ToRegister(instr->temp());
|
| Label no_memento_found;
|
| __ TestJSArrayForAllocationMemento(object, temp, &no_memento_found);
|
| - DeoptimizeIf(equal, instr, Deoptimizer::kMementoFound);
|
| + DeoptimizeIf(equal, instr, DeoptimizeReason::kMementoFound);
|
| __ bind(&no_memento_found);
|
| }
|
|
|
| @@ -3995,7 +3993,7 @@ void LCodeGen::DoDeferredMaybeGrowElements(LMaybeGrowElements* instr) {
|
|
|
| // Deopt on smi, which means the elements array changed to dictionary mode.
|
| __ test(result, Immediate(kSmiTagMask));
|
| - DeoptimizeIf(equal, instr, Deoptimizer::kSmi);
|
| + DeoptimizeIf(equal, instr, DeoptimizeReason::kSmi);
|
| }
|
|
|
|
|
| @@ -4335,12 +4333,12 @@ void LCodeGen::DoSmiTag(LSmiTag* instr) {
|
| if (hchange->CheckFlag(HValue::kCanOverflow) &&
|
| hchange->value()->CheckFlag(HValue::kUint32)) {
|
| __ test(input, Immediate(0xc0000000));
|
| - DeoptimizeIf(not_zero, instr, Deoptimizer::kOverflow);
|
| + DeoptimizeIf(not_zero, instr, DeoptimizeReason::kOverflow);
|
| }
|
| __ SmiTag(input);
|
| if (hchange->CheckFlag(HValue::kCanOverflow) &&
|
| !hchange->value()->CheckFlag(HValue::kUint32)) {
|
| - DeoptimizeIf(overflow, instr, Deoptimizer::kOverflow);
|
| + DeoptimizeIf(overflow, instr, DeoptimizeReason::kOverflow);
|
| }
|
| }
|
|
|
| @@ -4351,7 +4349,7 @@ void LCodeGen::DoSmiUntag(LSmiUntag* instr) {
|
| DCHECK(input->IsRegister() && input->Equals(instr->result()));
|
| if (instr->needs_check()) {
|
| __ test(result, Immediate(kSmiTagMask));
|
| - DeoptimizeIf(not_zero, instr, Deoptimizer::kNotASmi);
|
| + DeoptimizeIf(not_zero, instr, DeoptimizeReason::kNotASmi);
|
| } else {
|
| __ AssertSmi(result);
|
| }
|
| @@ -4378,7 +4376,7 @@ void LCodeGen::EmitNumberUntagD(LNumberUntagD* instr, Register input_reg,
|
| if (can_convert_undefined_to_nan) {
|
| __ j(not_equal, &convert, Label::kNear);
|
| } else {
|
| - DeoptimizeIf(not_equal, instr, Deoptimizer::kNotAHeapNumber);
|
| + DeoptimizeIf(not_equal, instr, DeoptimizeReason::kNotAHeapNumber);
|
| }
|
|
|
| // Heap number to XMM conversion.
|
| @@ -4391,7 +4389,7 @@ void LCodeGen::EmitNumberUntagD(LNumberUntagD* instr, Register input_reg,
|
| __ j(not_zero, &done, Label::kNear);
|
| __ movmskpd(temp_reg, result_reg);
|
| __ test_b(temp_reg, Immediate(1));
|
| - DeoptimizeIf(not_zero, instr, Deoptimizer::kMinusZero);
|
| + DeoptimizeIf(not_zero, instr, DeoptimizeReason::kMinusZero);
|
| }
|
| __ jmp(&done, Label::kNear);
|
|
|
| @@ -4400,7 +4398,8 @@ void LCodeGen::EmitNumberUntagD(LNumberUntagD* instr, Register input_reg,
|
|
|
| // Convert undefined to NaN.
|
| __ cmp(input_reg, factory()->undefined_value());
|
| - DeoptimizeIf(not_equal, instr, Deoptimizer::kNotAHeapNumberUndefined);
|
| + DeoptimizeIf(not_equal, instr,
|
| + DeoptimizeReason::kNotAHeapNumberUndefined);
|
|
|
| __ pcmpeqd(result_reg, result_reg);
|
| __ jmp(&done, Label::kNear);
|
| @@ -4453,26 +4452,26 @@ void LCodeGen::DoDeferredTaggedToI(LTaggedToI* instr, Label* done) {
|
| __ bind(&check_false);
|
| __ cmp(input_reg, factory()->false_value());
|
| DeoptimizeIf(not_equal, instr,
|
| - Deoptimizer::kNotAHeapNumberUndefinedBoolean);
|
| + DeoptimizeReason::kNotAHeapNumberUndefinedBoolean);
|
| __ Move(input_reg, Immediate(0));
|
| } else {
|
| XMMRegister scratch = ToDoubleRegister(instr->temp());
|
| DCHECK(!scratch.is(xmm0));
|
| __ cmp(FieldOperand(input_reg, HeapObject::kMapOffset),
|
| isolate()->factory()->heap_number_map());
|
| - DeoptimizeIf(not_equal, instr, Deoptimizer::kNotAHeapNumber);
|
| + DeoptimizeIf(not_equal, instr, DeoptimizeReason::kNotAHeapNumber);
|
| __ movsd(xmm0, FieldOperand(input_reg, HeapNumber::kValueOffset));
|
| __ cvttsd2si(input_reg, Operand(xmm0));
|
| __ Cvtsi2sd(scratch, Operand(input_reg));
|
| __ ucomisd(xmm0, scratch);
|
| - DeoptimizeIf(not_equal, instr, Deoptimizer::kLostPrecision);
|
| - DeoptimizeIf(parity_even, instr, Deoptimizer::kNaN);
|
| + DeoptimizeIf(not_equal, instr, DeoptimizeReason::kLostPrecision);
|
| + DeoptimizeIf(parity_even, instr, DeoptimizeReason::kNaN);
|
| if (instr->hydrogen()->GetMinusZeroMode() == FAIL_ON_MINUS_ZERO) {
|
| __ test(input_reg, Operand(input_reg));
|
| __ j(not_zero, done);
|
| __ movmskpd(input_reg, xmm0);
|
| __ and_(input_reg, 1);
|
| - DeoptimizeIf(not_zero, instr, Deoptimizer::kMinusZero);
|
| + DeoptimizeIf(not_zero, instr, DeoptimizeReason::kMinusZero);
|
| }
|
| }
|
| }
|
| @@ -4552,11 +4551,11 @@ void LCodeGen::DoDoubleToI(LDoubleToI* instr) {
|
| &is_nan, &minus_zero, dist);
|
| __ jmp(&done, dist);
|
| __ bind(&lost_precision);
|
| - DeoptimizeIf(no_condition, instr, Deoptimizer::kLostPrecision);
|
| + DeoptimizeIf(no_condition, instr, DeoptimizeReason::kLostPrecision);
|
| __ bind(&is_nan);
|
| - DeoptimizeIf(no_condition, instr, Deoptimizer::kNaN);
|
| + DeoptimizeIf(no_condition, instr, DeoptimizeReason::kNaN);
|
| __ bind(&minus_zero);
|
| - DeoptimizeIf(no_condition, instr, Deoptimizer::kMinusZero);
|
| + DeoptimizeIf(no_condition, instr, DeoptimizeReason::kMinusZero);
|
| __ bind(&done);
|
| }
|
| }
|
| @@ -4578,21 +4577,21 @@ void LCodeGen::DoDoubleToSmi(LDoubleToSmi* instr) {
|
| &minus_zero, dist);
|
| __ jmp(&done, dist);
|
| __ bind(&lost_precision);
|
| - DeoptimizeIf(no_condition, instr, Deoptimizer::kLostPrecision);
|
| + DeoptimizeIf(no_condition, instr, DeoptimizeReason::kLostPrecision);
|
| __ bind(&is_nan);
|
| - DeoptimizeIf(no_condition, instr, Deoptimizer::kNaN);
|
| + DeoptimizeIf(no_condition, instr, DeoptimizeReason::kNaN);
|
| __ bind(&minus_zero);
|
| - DeoptimizeIf(no_condition, instr, Deoptimizer::kMinusZero);
|
| + DeoptimizeIf(no_condition, instr, DeoptimizeReason::kMinusZero);
|
| __ bind(&done);
|
| __ SmiTag(result_reg);
|
| - DeoptimizeIf(overflow, instr, Deoptimizer::kOverflow);
|
| + DeoptimizeIf(overflow, instr, DeoptimizeReason::kOverflow);
|
| }
|
|
|
|
|
| void LCodeGen::DoCheckSmi(LCheckSmi* instr) {
|
| LOperand* input = instr->value();
|
| __ test(ToOperand(input), Immediate(kSmiTagMask));
|
| - DeoptimizeIf(not_zero, instr, Deoptimizer::kNotASmi);
|
| + DeoptimizeIf(not_zero, instr, DeoptimizeReason::kNotASmi);
|
| }
|
|
|
|
|
| @@ -4600,7 +4599,7 @@ void LCodeGen::DoCheckNonSmi(LCheckNonSmi* instr) {
|
| if (!instr->hydrogen()->value()->type().IsHeapObject()) {
|
| LOperand* input = instr->value();
|
| __ test(ToOperand(input), Immediate(kSmiTagMask));
|
| - DeoptimizeIf(zero, instr, Deoptimizer::kSmi);
|
| + DeoptimizeIf(zero, instr, DeoptimizeReason::kSmi);
|
| }
|
| }
|
|
|
| @@ -4613,7 +4612,7 @@ void LCodeGen::DoCheckArrayBufferNotNeutered(
|
| __ mov(scratch, FieldOperand(view, JSArrayBufferView::kBufferOffset));
|
| __ test_b(FieldOperand(scratch, JSArrayBuffer::kBitFieldOffset),
|
| Immediate(1 << JSArrayBuffer::WasNeutered::kShift));
|
| - DeoptimizeIf(not_zero, instr, Deoptimizer::kOutOfBounds);
|
| + DeoptimizeIf(not_zero, instr, DeoptimizeReason::kOutOfBounds);
|
| }
|
|
|
|
|
| @@ -4632,13 +4631,13 @@ void LCodeGen::DoCheckInstanceType(LCheckInstanceType* instr) {
|
|
|
| // If there is only one type in the interval check for equality.
|
| if (first == last) {
|
| - DeoptimizeIf(not_equal, instr, Deoptimizer::kWrongInstanceType);
|
| + DeoptimizeIf(not_equal, instr, DeoptimizeReason::kWrongInstanceType);
|
| } else {
|
| - DeoptimizeIf(below, instr, Deoptimizer::kWrongInstanceType);
|
| + DeoptimizeIf(below, instr, DeoptimizeReason::kWrongInstanceType);
|
| // Omit check for the last type.
|
| if (last != LAST_TYPE) {
|
| __ cmpb(FieldOperand(temp, Map::kInstanceTypeOffset), Immediate(last));
|
| - DeoptimizeIf(above, instr, Deoptimizer::kWrongInstanceType);
|
| + DeoptimizeIf(above, instr, DeoptimizeReason::kWrongInstanceType);
|
| }
|
| }
|
| } else {
|
| @@ -4650,12 +4649,12 @@ void LCodeGen::DoCheckInstanceType(LCheckInstanceType* instr) {
|
| DCHECK(tag == 0 || base::bits::IsPowerOfTwo32(tag));
|
| __ test_b(FieldOperand(temp, Map::kInstanceTypeOffset), Immediate(mask));
|
| DeoptimizeIf(tag == 0 ? not_zero : zero, instr,
|
| - Deoptimizer::kWrongInstanceType);
|
| + DeoptimizeReason::kWrongInstanceType);
|
| } else {
|
| __ movzx_b(temp, FieldOperand(temp, Map::kInstanceTypeOffset));
|
| __ and_(temp, mask);
|
| __ cmp(temp, tag);
|
| - DeoptimizeIf(not_equal, instr, Deoptimizer::kWrongInstanceType);
|
| + DeoptimizeIf(not_equal, instr, DeoptimizeReason::kWrongInstanceType);
|
| }
|
| }
|
| }
|
| @@ -4671,7 +4670,7 @@ void LCodeGen::DoCheckValue(LCheckValue* instr) {
|
| Operand operand = ToOperand(instr->value());
|
| __ cmp(operand, object);
|
| }
|
| - DeoptimizeIf(not_equal, instr, Deoptimizer::kValueMismatch);
|
| + DeoptimizeIf(not_equal, instr, DeoptimizeReason::kValueMismatch);
|
| }
|
|
|
|
|
| @@ -4686,7 +4685,7 @@ void LCodeGen::DoDeferredInstanceMigration(LCheckMaps* instr, Register object) {
|
|
|
| __ test(eax, Immediate(kSmiTagMask));
|
| }
|
| - DeoptimizeIf(zero, instr, Deoptimizer::kInstanceMigrationFailed);
|
| + DeoptimizeIf(zero, instr, DeoptimizeReason::kInstanceMigrationFailed);
|
| }
|
|
|
|
|
| @@ -4740,7 +4739,7 @@ void LCodeGen::DoCheckMaps(LCheckMaps* instr) {
|
| if (instr->hydrogen()->HasMigrationTarget()) {
|
| __ j(not_equal, deferred->entry());
|
| } else {
|
| - DeoptimizeIf(not_equal, instr, Deoptimizer::kWrongMap);
|
| + DeoptimizeIf(not_equal, instr, DeoptimizeReason::kWrongMap);
|
| }
|
|
|
| __ bind(&success);
|
| @@ -4779,7 +4778,7 @@ void LCodeGen::DoClampTToUint8(LClampTToUint8* instr) {
|
| // Check for undefined. Undefined is converted to zero for clamping
|
| // conversions.
|
| __ cmp(input_reg, factory()->undefined_value());
|
| - DeoptimizeIf(not_equal, instr, Deoptimizer::kNotAHeapNumberUndefined);
|
| + DeoptimizeIf(not_equal, instr, DeoptimizeReason::kNotAHeapNumberUndefined);
|
| __ mov(input_reg, 0);
|
| __ jmp(&done, Label::kNear);
|
|
|
| @@ -5204,7 +5203,7 @@ void LCodeGen::DoForInCacheArray(LForInCacheArray* instr) {
|
| FieldOperand(result, FixedArray::SizeFor(instr->idx())));
|
| __ bind(&done);
|
| __ test(result, result);
|
| - DeoptimizeIf(equal, instr, Deoptimizer::kNoCache);
|
| + DeoptimizeIf(equal, instr, DeoptimizeReason::kNoCache);
|
| }
|
|
|
|
|
| @@ -5212,7 +5211,7 @@ void LCodeGen::DoCheckMapValue(LCheckMapValue* instr) {
|
| Register object = ToRegister(instr->value());
|
| __ cmp(ToRegister(instr->map()),
|
| FieldOperand(object, HeapObject::kMapOffset));
|
| - DeoptimizeIf(not_equal, instr, Deoptimizer::kWrongMap);
|
| + DeoptimizeIf(not_equal, instr, DeoptimizeReason::kWrongMap);
|
| }
|
|
|
|
|
|
|