| Index: src/mips64/lithium-codegen-mips64.cc
|
| diff --git a/src/mips64/lithium-codegen-mips64.cc b/src/mips64/lithium-codegen-mips64.cc
|
| index 8a0a44991a5d99a1f450ca723f3820c426f14bfa..2ed9782ff0abd47e9d6197c48be29232a6b8ed8e 100644
|
| --- a/src/mips64/lithium-codegen-mips64.cc
|
| +++ b/src/mips64/lithium-codegen-mips64.cc
|
| @@ -766,8 +766,8 @@ void LCodeGen::RegisterEnvironmentForDeoptimization(LEnvironment* environment,
|
|
|
| void LCodeGen::DeoptimizeIf(Condition condition, LInstruction* instr,
|
| Deoptimizer::BailoutType bailout_type,
|
| - Register src1, const Operand& src2,
|
| - const char* detail) {
|
| + const char* detail, Register src1,
|
| + const Operand& src2) {
|
| LEnvironment* environment = instr->environment();
|
| RegisterEnvironmentForDeoptimization(environment, Safepoint::kNoLazyDeopt);
|
| DCHECK(environment->HasBeenRegistered());
|
| @@ -832,12 +832,12 @@ void LCodeGen::DeoptimizeIf(Condition condition, LInstruction* instr,
|
|
|
|
|
| void LCodeGen::DeoptimizeIf(Condition condition, LInstruction* instr,
|
| - Register src1, const Operand& src2,
|
| - const char* detail) {
|
| + const char* detail, Register src1,
|
| + const Operand& src2) {
|
| Deoptimizer::BailoutType bailout_type = info()->IsStub()
|
| ? Deoptimizer::LAZY
|
| : Deoptimizer::EAGER;
|
| - DeoptimizeIf(condition, instr, bailout_type, src1, src2, detail);
|
| + DeoptimizeIf(condition, instr, bailout_type, detail, src1, src2);
|
| }
|
|
|
|
|
| @@ -1067,7 +1067,7 @@ void LCodeGen::DoModByPowerOf2I(LModByPowerOf2I* instr) {
|
| __ dsubu(dividend, zero_reg, dividend);
|
| __ And(dividend, dividend, Operand(mask));
|
| if (hmod->CheckFlag(HValue::kBailoutOnMinusZero)) {
|
| - DeoptimizeIf(eq, instr, dividend, Operand(zero_reg));
|
| + DeoptimizeIf(eq, instr, "minus zero", dividend, Operand(zero_reg));
|
| }
|
| __ Branch(USE_DELAY_SLOT, &done);
|
| __ dsubu(dividend, zero_reg, dividend);
|
| @@ -1086,7 +1086,7 @@ void LCodeGen::DoModByConstI(LModByConstI* instr) {
|
| DCHECK(!dividend.is(result));
|
|
|
| if (divisor == 0) {
|
| - DeoptimizeIf(al, instr);
|
| + DeoptimizeIf(al, instr, "division by zero");
|
| return;
|
| }
|
|
|
| @@ -1099,7 +1099,7 @@ void LCodeGen::DoModByConstI(LModByConstI* instr) {
|
| if (hmod->CheckFlag(HValue::kBailoutOnMinusZero)) {
|
| Label remainder_not_zero;
|
| __ Branch(&remainder_not_zero, ne, result, Operand(zero_reg));
|
| - DeoptimizeIf(lt, instr, dividend, Operand(zero_reg));
|
| + DeoptimizeIf(lt, instr, "minus zero", dividend, Operand(zero_reg));
|
| __ bind(&remainder_not_zero);
|
| }
|
| }
|
| @@ -1118,7 +1118,7 @@ void LCodeGen::DoModI(LModI* instr) {
|
| // Check for x % 0, we have to deopt in this case because we can't return a
|
| // NaN.
|
| if (hmod->CheckFlag(HValue::kCanBeDivByZero)) {
|
| - DeoptimizeIf(eq, instr, right_reg, Operand(zero_reg));
|
| + DeoptimizeIf(eq, instr, "division by zero", right_reg, Operand(zero_reg));
|
| }
|
|
|
| // Check for kMinInt % -1, div will return kMinInt, which is not what we
|
| @@ -1127,7 +1127,7 @@ void LCodeGen::DoModI(LModI* instr) {
|
| Label no_overflow_possible;
|
| __ Branch(&no_overflow_possible, ne, left_reg, Operand(kMinInt));
|
| if (hmod->CheckFlag(HValue::kBailoutOnMinusZero)) {
|
| - DeoptimizeIf(eq, instr, right_reg, Operand(-1));
|
| + DeoptimizeIf(eq, instr, "minus zero", right_reg, Operand(-1));
|
| } else {
|
| __ Branch(&no_overflow_possible, ne, right_reg, Operand(-1));
|
| __ Branch(USE_DELAY_SLOT, &done);
|
| @@ -1140,7 +1140,7 @@ void LCodeGen::DoModI(LModI* instr) {
|
| __ Branch(&done, ge, left_reg, Operand(zero_reg));
|
|
|
| if (hmod->CheckFlag(HValue::kBailoutOnMinusZero)) {
|
| - DeoptimizeIf(eq, instr, result_reg, Operand(zero_reg));
|
| + DeoptimizeIf(eq, instr, "minus zero", result_reg, Operand(zero_reg));
|
| }
|
| __ bind(&done);
|
| }
|
| @@ -1156,18 +1156,18 @@ void LCodeGen::DoDivByPowerOf2I(LDivByPowerOf2I* instr) {
|
| // Check for (0 / -x) that will produce negative zero.
|
| HDiv* hdiv = instr->hydrogen();
|
| if (hdiv->CheckFlag(HValue::kBailoutOnMinusZero) && divisor < 0) {
|
| - DeoptimizeIf(eq, instr, dividend, Operand(zero_reg));
|
| + DeoptimizeIf(eq, instr, "minus zero", dividend, Operand(zero_reg));
|
| }
|
| // Check for (kMinInt / -1).
|
| if (hdiv->CheckFlag(HValue::kCanOverflow) && divisor == -1) {
|
| - DeoptimizeIf(eq, instr, dividend, Operand(kMinInt));
|
| + DeoptimizeIf(eq, instr, "overflow", dividend, Operand(kMinInt));
|
| }
|
| // 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);
|
| __ And(at, dividend, Operand(mask));
|
| - DeoptimizeIf(ne, instr, at, Operand(zero_reg));
|
| + DeoptimizeIf(ne, instr, "lost precision", at, Operand(zero_reg));
|
| }
|
|
|
| if (divisor == -1) { // Nice shortcut, not needed for correctness.
|
| @@ -1197,14 +1197,14 @@ void LCodeGen::DoDivByConstI(LDivByConstI* instr) {
|
| DCHECK(!dividend.is(result));
|
|
|
| if (divisor == 0) {
|
| - DeoptimizeIf(al, instr);
|
| + DeoptimizeIf(al, instr, "division by zero");
|
| return;
|
| }
|
|
|
| // Check for (0 / -x) that will produce negative zero.
|
| HDiv* hdiv = instr->hydrogen();
|
| if (hdiv->CheckFlag(HValue::kBailoutOnMinusZero) && divisor < 0) {
|
| - DeoptimizeIf(eq, instr, dividend, Operand(zero_reg));
|
| + DeoptimizeIf(eq, instr, "minus zero", dividend, Operand(zero_reg));
|
| }
|
|
|
| __ TruncatingDiv(result, dividend, Abs(divisor));
|
| @@ -1213,7 +1213,7 @@ void LCodeGen::DoDivByConstI(LDivByConstI* instr) {
|
| if (!hdiv->CheckFlag(HInstruction::kAllUsesTruncatingToInt32)) {
|
| __ Dmul(scratch0(), result, Operand(divisor));
|
| __ Dsubu(scratch0(), scratch0(), dividend);
|
| - DeoptimizeIf(ne, instr, scratch0(), Operand(zero_reg));
|
| + DeoptimizeIf(ne, instr, "lost precision", scratch0(), Operand(zero_reg));
|
| }
|
| }
|
|
|
| @@ -1231,14 +1231,14 @@ void LCodeGen::DoDivI(LDivI* instr) {
|
|
|
| // Check for x / 0.
|
| if (hdiv->CheckFlag(HValue::kCanBeDivByZero)) {
|
| - DeoptimizeIf(eq, instr, divisor, Operand(zero_reg));
|
| + DeoptimizeIf(eq, instr, "division by zero", divisor, Operand(zero_reg));
|
| }
|
|
|
| // Check for (0 / -x) that will produce negative zero.
|
| if (hdiv->CheckFlag(HValue::kBailoutOnMinusZero)) {
|
| Label left_not_zero;
|
| __ Branch(&left_not_zero, ne, dividend, Operand(zero_reg));
|
| - DeoptimizeIf(lt, instr, divisor, Operand(zero_reg));
|
| + DeoptimizeIf(lt, instr, "minus zero", divisor, Operand(zero_reg));
|
| __ bind(&left_not_zero);
|
| }
|
|
|
| @@ -1247,7 +1247,7 @@ void LCodeGen::DoDivI(LDivI* instr) {
|
| !hdiv->CheckFlag(HValue::kAllUsesTruncatingToInt32)) {
|
| Label left_not_min_int;
|
| __ Branch(&left_not_min_int, ne, dividend, Operand(kMinInt));
|
| - DeoptimizeIf(eq, instr, divisor, Operand(-1));
|
| + DeoptimizeIf(eq, instr, "overflow", divisor, Operand(-1));
|
| __ bind(&left_not_min_int);
|
| }
|
|
|
| @@ -1259,7 +1259,7 @@ void LCodeGen::DoDivI(LDivI* instr) {
|
| } else {
|
| __ dmod(remainder, dividend, divisor);
|
| }
|
| - DeoptimizeIf(ne, instr, remainder, Operand(zero_reg));
|
| + DeoptimizeIf(ne, instr, "lost precision", remainder, Operand(zero_reg));
|
| }
|
| }
|
|
|
| @@ -1304,14 +1304,14 @@ void LCodeGen::DoFlooringDivByPowerOf2I(LFlooringDivByPowerOf2I* instr) {
|
|
|
| __ Dsubu(result, zero_reg, dividend);
|
| if (instr->hydrogen()->CheckFlag(HValue::kBailoutOnMinusZero)) {
|
| - DeoptimizeIf(eq, instr, result, Operand(zero_reg));
|
| + DeoptimizeIf(eq, instr, "minus zero", result, Operand(zero_reg));
|
| }
|
|
|
| __ Xor(scratch, scratch, result);
|
| // Dividing by -1 is basically negation, unless we overflow.
|
| if (divisor == -1) {
|
| if (instr->hydrogen()->CheckFlag(HValue::kLeftCanBeMinInt)) {
|
| - DeoptimizeIf(gt, instr, result, Operand(kMaxInt));
|
| + DeoptimizeIf(gt, instr, "overflow", result, Operand(kMaxInt));
|
| }
|
| return;
|
| }
|
| @@ -1339,14 +1339,14 @@ void LCodeGen::DoFlooringDivByConstI(LFlooringDivByConstI* instr) {
|
| DCHECK(!dividend.is(result));
|
|
|
| if (divisor == 0) {
|
| - DeoptimizeIf(al, instr);
|
| + DeoptimizeIf(al, instr, "division by zero");
|
| return;
|
| }
|
|
|
| // Check for (0 / -x) that will produce negative zero.
|
| HMathFloorOfDiv* hdiv = instr->hydrogen();
|
| if (hdiv->CheckFlag(HValue::kBailoutOnMinusZero) && divisor < 0) {
|
| - DeoptimizeIf(eq, instr, dividend, Operand(zero_reg));
|
| + DeoptimizeIf(eq, instr, "minus zero", dividend, Operand(zero_reg));
|
| }
|
|
|
| // Easy case: We need no dynamic check for the dividend and the flooring
|
| @@ -1390,14 +1390,14 @@ void LCodeGen::DoFlooringDivI(LFlooringDivI* instr) {
|
|
|
| // Check for x / 0.
|
| if (hdiv->CheckFlag(HValue::kCanBeDivByZero)) {
|
| - DeoptimizeIf(eq, instr, divisor, Operand(zero_reg));
|
| + DeoptimizeIf(eq, instr, "division by zero", divisor, Operand(zero_reg));
|
| }
|
|
|
| // Check for (0 / -x) that will produce negative zero.
|
| if (hdiv->CheckFlag(HValue::kBailoutOnMinusZero)) {
|
| Label left_not_zero;
|
| __ Branch(&left_not_zero, ne, dividend, Operand(zero_reg));
|
| - DeoptimizeIf(lt, instr, divisor, Operand(zero_reg));
|
| + DeoptimizeIf(lt, instr, "minus zero", divisor, Operand(zero_reg));
|
| __ bind(&left_not_zero);
|
| }
|
|
|
| @@ -1406,7 +1406,7 @@ void LCodeGen::DoFlooringDivI(LFlooringDivI* instr) {
|
| !hdiv->CheckFlag(HValue::kAllUsesTruncatingToInt32)) {
|
| Label left_not_min_int;
|
| __ Branch(&left_not_min_int, ne, dividend, Operand(kMinInt));
|
| - DeoptimizeIf(eq, instr, divisor, Operand(-1));
|
| + DeoptimizeIf(eq, instr, "overflow", divisor, Operand(-1));
|
| __ bind(&left_not_min_int);
|
| }
|
|
|
| @@ -1443,14 +1443,14 @@ void LCodeGen::DoMulI(LMulI* instr) {
|
| if (bailout_on_minus_zero && (constant < 0)) {
|
| // The case of a null constant will be handled separately.
|
| // If constant is negative and left is null, the result should be -0.
|
| - DeoptimizeIf(eq, instr, left, Operand(zero_reg));
|
| + DeoptimizeIf(eq, instr, "minus zero", left, Operand(zero_reg));
|
| }
|
|
|
| switch (constant) {
|
| case -1:
|
| if (overflow) {
|
| __ SubuAndCheckForOverflow(result, zero_reg, left, scratch);
|
| - DeoptimizeIf(gt, instr, scratch, Operand(kMaxInt));
|
| + DeoptimizeIf(gt, instr, "overflow", scratch, Operand(kMaxInt));
|
| } else {
|
| __ Dsubu(result, zero_reg, left);
|
| }
|
| @@ -1459,7 +1459,7 @@ void LCodeGen::DoMulI(LMulI* instr) {
|
| if (bailout_on_minus_zero) {
|
| // If left is strictly negative and the constant is null, the
|
| // result is -0. Deoptimize if required, otherwise return 0.
|
| - DeoptimizeIf(lt, instr, left, Operand(zero_reg));
|
| + DeoptimizeIf(lt, instr, "minus zero", left, Operand(zero_reg));
|
| }
|
| __ mov(result, zero_reg);
|
| break;
|
| @@ -1514,7 +1514,7 @@ void LCodeGen::DoMulI(LMulI* instr) {
|
| if (instr->hydrogen()->representation().IsSmi()) {
|
| __ SmiTag(result);
|
| }
|
| - DeoptimizeIf(ne, instr, scratch, Operand(at));
|
| + DeoptimizeIf(ne, instr, "overflow", scratch, Operand(at));
|
| } else {
|
| if (instr->hydrogen()->representation().IsSmi()) {
|
| __ SmiUntag(result, left);
|
| @@ -1529,7 +1529,7 @@ void LCodeGen::DoMulI(LMulI* instr) {
|
| __ Xor(at, left, right);
|
| __ Branch(&done, ge, at, Operand(zero_reg));
|
| // Bail out if the result is minus zero.
|
| - DeoptimizeIf(eq, instr, result, Operand(zero_reg));
|
| + DeoptimizeIf(eq, instr, "minus zero", result, Operand(zero_reg));
|
| __ bind(&done);
|
| }
|
| }
|
| @@ -1593,8 +1593,8 @@ void LCodeGen::DoShiftI(LShiftI* instr) {
|
| __ srlv(result, left, ToRegister(right_op));
|
| if (instr->can_deopt()) {
|
| // TODO(yy): (-1) >>> 0. anything else?
|
| - DeoptimizeIf(lt, instr, result, Operand(zero_reg));
|
| - DeoptimizeIf(gt, instr, result, Operand(kMaxInt));
|
| + DeoptimizeIf(lt, instr, "negative value", result, Operand(zero_reg));
|
| + DeoptimizeIf(gt, instr, "negative value", result, Operand(kMaxInt));
|
| }
|
| break;
|
| case Token::SHL:
|
| @@ -1629,7 +1629,7 @@ void LCodeGen::DoShiftI(LShiftI* instr) {
|
| } else {
|
| if (instr->can_deopt()) {
|
| __ And(at, left, Operand(0x80000000));
|
| - DeoptimizeIf(ne, instr, at, Operand(zero_reg));
|
| + DeoptimizeIf(ne, instr, "negative value", at, Operand(zero_reg));
|
| }
|
| __ Move(result, left);
|
| }
|
| @@ -1685,10 +1685,10 @@ void LCodeGen::DoSubI(LSubI* instr) {
|
| ToRegister(right),
|
| overflow); // Reg at also used as scratch.
|
| }
|
| - DeoptimizeIf(lt, instr, overflow, Operand(zero_reg));
|
| + DeoptimizeIf(lt, instr, "overflow", overflow, Operand(zero_reg));
|
| if (!instr->hydrogen()->representation().IsSmi()) {
|
| - DeoptimizeIf(gt, instr, ToRegister(result), Operand(kMaxInt));
|
| - DeoptimizeIf(lt, instr, ToRegister(result), Operand(kMinInt));
|
| + DeoptimizeIf(gt, instr, "overflow", ToRegister(result), Operand(kMaxInt));
|
| + DeoptimizeIf(lt, instr, "overflow", ToRegister(result), Operand(kMinInt));
|
| }
|
| }
|
| }
|
| @@ -1743,9 +1743,9 @@ void LCodeGen::DoDateField(LDateField* instr) {
|
| DCHECK(!scratch.is(object));
|
|
|
| __ SmiTst(object, at);
|
| - DeoptimizeIf(eq, instr, at, Operand(zero_reg));
|
| + DeoptimizeIf(eq, instr, "Smi", at, Operand(zero_reg));
|
| __ GetObjectType(object, scratch, scratch);
|
| - DeoptimizeIf(ne, instr, scratch, Operand(JS_DATE_TYPE));
|
| + DeoptimizeIf(ne, instr, "not a date object", scratch, Operand(JS_DATE_TYPE));
|
|
|
| if (index->value() == 0) {
|
| __ ld(result, FieldMemOperand(object, JSDate::kValueOffset));
|
| @@ -1880,11 +1880,11 @@ void LCodeGen::DoAddI(LAddI* instr) {
|
| ToRegister(right),
|
| overflow); // Reg at also used as scratch.
|
| }
|
| - DeoptimizeIf(lt, instr, overflow, Operand(zero_reg));
|
| + DeoptimizeIf(lt, instr, "overflow", overflow, Operand(zero_reg));
|
| // if not smi, it must int32.
|
| if (!instr->hydrogen()->representation().IsSmi()) {
|
| - DeoptimizeIf(gt, instr, ToRegister(result), Operand(kMaxInt));
|
| - DeoptimizeIf(lt, instr, ToRegister(result), Operand(kMinInt));
|
| + DeoptimizeIf(gt, instr, "overflow", ToRegister(result), Operand(kMaxInt));
|
| + DeoptimizeIf(lt, instr, "overflow", ToRegister(result), Operand(kMinInt));
|
| }
|
| }
|
| }
|
| @@ -2146,7 +2146,7 @@ void LCodeGen::DoBranch(LBranch* instr) {
|
| } else if (expected.NeedsMap()) {
|
| // If we need a map later and have a Smi -> deopt.
|
| __ SmiTst(reg, at);
|
| - DeoptimizeIf(eq, instr, at, Operand(zero_reg));
|
| + DeoptimizeIf(eq, instr, "Smi", at, Operand(zero_reg));
|
| }
|
|
|
| const Register map = scratch0();
|
| @@ -2202,7 +2202,8 @@ 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(al, instr, zero_reg, Operand(zero_reg));
|
| + DeoptimizeIf(al, instr, "unexpected object", zero_reg,
|
| + Operand(zero_reg));
|
| }
|
| }
|
| }
|
| @@ -2848,7 +2849,7 @@ void LCodeGen::DoLoadGlobalCell(LLoadGlobalCell* instr) {
|
| __ ld(result, FieldMemOperand(at, Cell::kValueOffset));
|
| if (instr->hydrogen()->RequiresHoleCheck()) {
|
| __ LoadRoot(at, Heap::kTheHoleValueRootIndex);
|
| - DeoptimizeIf(eq, instr, result, Operand(at));
|
| + DeoptimizeIf(eq, instr, "hole", result, Operand(at));
|
| }
|
| }
|
|
|
| @@ -2898,7 +2899,7 @@ void LCodeGen::DoStoreGlobalCell(LStoreGlobalCell* instr) {
|
| Register payload = ToRegister(instr->temp());
|
| __ ld(payload, FieldMemOperand(cell, Cell::kValueOffset));
|
| __ LoadRoot(at, Heap::kTheHoleValueRootIndex);
|
| - DeoptimizeIf(eq, instr, payload, Operand(at));
|
| + DeoptimizeIf(eq, instr, "hole", payload, Operand(at));
|
| }
|
|
|
| // Store the value.
|
| @@ -2916,7 +2917,7 @@ void LCodeGen::DoLoadContextSlot(LLoadContextSlot* instr) {
|
| __ LoadRoot(at, Heap::kTheHoleValueRootIndex);
|
|
|
| if (instr->hydrogen()->DeoptimizesOnHole()) {
|
| - DeoptimizeIf(eq, instr, result, Operand(at));
|
| + DeoptimizeIf(eq, instr, "hole", result, Operand(at));
|
| } else {
|
| Label is_not_hole;
|
| __ Branch(&is_not_hole, ne, result, Operand(at));
|
| @@ -2940,7 +2941,7 @@ void LCodeGen::DoStoreContextSlot(LStoreContextSlot* instr) {
|
| __ LoadRoot(at, Heap::kTheHoleValueRootIndex);
|
|
|
| if (instr->hydrogen()->DeoptimizesOnHole()) {
|
| - DeoptimizeIf(eq, instr, scratch, Operand(at));
|
| + DeoptimizeIf(eq, instr, "hole", scratch, Operand(at));
|
| } else {
|
| __ Branch(&skip_assignment, ne, scratch, Operand(at));
|
| }
|
| @@ -3034,7 +3035,7 @@ void LCodeGen::DoLoadFunctionPrototype(LLoadFunctionPrototype* instr) {
|
|
|
| // Check that the function has a prototype or an initial map.
|
| __ LoadRoot(at, Heap::kTheHoleValueRootIndex);
|
| - DeoptimizeIf(eq, instr, result, Operand(at));
|
| + DeoptimizeIf(eq, instr, "hole", result, Operand(at));
|
|
|
| // If the function does not have an initial map, we're done.
|
| Label done;
|
| @@ -3180,7 +3181,8 @@ void LCodeGen::DoLoadKeyedExternalArray(LLoadKeyed* instr) {
|
| case UINT32_ELEMENTS:
|
| __ lw(result, mem_operand);
|
| if (!instr->hydrogen()->CheckFlag(HInstruction::kUint32)) {
|
| - DeoptimizeIf(Ugreater_equal, instr, result, Operand(0x80000000));
|
| + DeoptimizeIf(Ugreater_equal, instr, "negative value", result,
|
| + Operand(0x80000000));
|
| }
|
| break;
|
| case FLOAT32_ELEMENTS:
|
| @@ -3240,7 +3242,7 @@ void LCodeGen::DoLoadKeyedFixedDoubleArray(LLoadKeyed* instr) {
|
|
|
| if (instr->hydrogen()->RequiresHoleCheck()) {
|
| __ lw(scratch, MemOperand(scratch, sizeof(kHoleNanLower32)));
|
| - DeoptimizeIf(eq, instr, scratch, Operand(kHoleNanUpper32));
|
| + DeoptimizeIf(eq, instr, "hole", scratch, Operand(kHoleNanUpper32));
|
| }
|
| }
|
|
|
| @@ -3294,10 +3296,10 @@ void LCodeGen::DoLoadKeyedFixedArray(LLoadKeyed* instr) {
|
| if (hinstr->RequiresHoleCheck()) {
|
| if (IsFastSmiElementsKind(instr->hydrogen()->elements_kind())) {
|
| __ SmiTst(result, scratch);
|
| - DeoptimizeIf(ne, instr, scratch, Operand(zero_reg));
|
| + DeoptimizeIf(ne, instr, "not a Smi", scratch, Operand(zero_reg));
|
| } else {
|
| __ LoadRoot(scratch, Heap::kTheHoleValueRootIndex);
|
| - DeoptimizeIf(eq, instr, result, Operand(scratch));
|
| + DeoptimizeIf(eq, instr, "hole", result, Operand(scratch));
|
| }
|
| }
|
| }
|
| @@ -3453,10 +3455,11 @@ void LCodeGen::DoWrapReceiver(LWrapReceiver* instr) {
|
|
|
| // Deoptimize if the receiver is not a JS object.
|
| __ SmiTst(receiver, scratch);
|
| - DeoptimizeIf(eq, instr, scratch, Operand(zero_reg));
|
| + DeoptimizeIf(eq, instr, "Smi", scratch, Operand(zero_reg));
|
|
|
| __ GetObjectType(receiver, scratch, scratch);
|
| - DeoptimizeIf(lt, instr, scratch, Operand(FIRST_SPEC_OBJECT_TYPE));
|
| + DeoptimizeIf(lt, instr, "not a JavaScript object", scratch,
|
| + Operand(FIRST_SPEC_OBJECT_TYPE));
|
| __ Branch(&result_in_receiver);
|
|
|
| __ bind(&global_object);
|
| @@ -3491,7 +3494,8 @@ void LCodeGen::DoApplyArguments(LApplyArguments* instr) {
|
| // Copy the arguments to this function possibly from the
|
| // adaptor frame below it.
|
| const uint32_t kArgumentsLimit = 1 * KB;
|
| - DeoptimizeIf(hi, instr, length, Operand(kArgumentsLimit));
|
| + DeoptimizeIf(hi, instr, "too many arguments", length,
|
| + Operand(kArgumentsLimit));
|
|
|
| // Push the receiver and use the register to keep the original
|
| // number of arguments.
|
| @@ -3621,7 +3625,7 @@ void LCodeGen::DoDeferredMathAbsTaggedHeapNumber(LMathAbs* instr) {
|
| // Deoptimize if not a heap number.
|
| __ ld(scratch, FieldMemOperand(input, HeapObject::kMapOffset));
|
| __ LoadRoot(at, Heap::kHeapNumberMapRootIndex);
|
| - DeoptimizeIf(ne, instr, scratch, Operand(at));
|
| + DeoptimizeIf(ne, instr, "not a heap number", scratch, Operand(at));
|
|
|
| Label done;
|
| Register exponent = scratch0();
|
| @@ -3688,7 +3692,7 @@ void LCodeGen::EmitIntegerMathAbs(LMathAbs* instr) {
|
| __ mov(result, input);
|
| __ dsubu(result, zero_reg, input);
|
| // Overflow if result is still negative, i.e. 0x80000000.
|
| - DeoptimizeIf(lt, instr, result, Operand(zero_reg));
|
| + DeoptimizeIf(lt, instr, "overflow", result, Operand(zero_reg));
|
| __ bind(&done);
|
| }
|
|
|
| @@ -3742,7 +3746,8 @@ void LCodeGen::DoMathFloor(LMathFloor* instr) {
|
| except_flag);
|
|
|
| // Deopt if the operation did not succeed.
|
| - DeoptimizeIf(ne, instr, except_flag, Operand(zero_reg));
|
| + DeoptimizeIf(ne, instr, "lost precision or NaN", except_flag,
|
| + Operand(zero_reg));
|
|
|
| if (instr->hydrogen()->CheckFlag(HValue::kBailoutOnMinusZero)) {
|
| // Test for -0.
|
| @@ -3750,7 +3755,7 @@ void LCodeGen::DoMathFloor(LMathFloor* instr) {
|
| __ Branch(&done, ne, result, Operand(zero_reg));
|
| __ mfhc1(scratch1, input); // Get exponent/sign bits.
|
| __ And(scratch1, scratch1, Operand(HeapNumber::kSignMask));
|
| - DeoptimizeIf(ne, instr, scratch1, Operand(zero_reg));
|
| + DeoptimizeIf(ne, instr, "minus zero", scratch1, Operand(zero_reg));
|
| __ bind(&done);
|
| }
|
| }
|
| @@ -3783,7 +3788,8 @@ void LCodeGen::DoMathRound(LMathRound* instr) {
|
|
|
| // The following conversion will not work with numbers
|
| // outside of ]-2^32, 2^32[.
|
| - DeoptimizeIf(ge, instr, scratch, Operand(HeapNumber::kExponentBias + 32));
|
| + DeoptimizeIf(ge, instr, "overflow", scratch,
|
| + Operand(HeapNumber::kExponentBias + 32));
|
|
|
| // Save the original sign for later comparison.
|
| __ And(scratch, result, Operand(HeapNumber::kSignMask));
|
| @@ -3800,7 +3806,7 @@ void LCodeGen::DoMathRound(LMathRound* instr) {
|
| __ Xor(result, result, Operand(scratch));
|
| if (instr->hydrogen()->CheckFlag(HValue::kBailoutOnMinusZero)) {
|
| // ARM uses 'mi' here, which is 'lt'
|
| - DeoptimizeIf(lt, instr, result, Operand(zero_reg));
|
| + DeoptimizeIf(lt, instr, "minus zero", result, Operand(zero_reg));
|
| } else {
|
| Label skip2;
|
| // ARM uses 'mi' here, which is 'lt'
|
| @@ -3819,7 +3825,8 @@ void LCodeGen::DoMathRound(LMathRound* instr) {
|
| double_scratch1,
|
| except_flag);
|
|
|
| - DeoptimizeIf(ne, instr, except_flag, Operand(zero_reg));
|
| + DeoptimizeIf(ne, instr, "lost precision or NaN", except_flag,
|
| + Operand(zero_reg));
|
|
|
| if (instr->hydrogen()->CheckFlag(HValue::kBailoutOnMinusZero)) {
|
| // Test for -0.
|
| @@ -3827,7 +3834,7 @@ void LCodeGen::DoMathRound(LMathRound* instr) {
|
| __ bind(&check_sign_on_zero);
|
| __ mfhc1(scratch, input); // Get exponent/sign bits.
|
| __ And(scratch, scratch, Operand(HeapNumber::kSignMask));
|
| - DeoptimizeIf(ne, instr, scratch, Operand(zero_reg));
|
| + DeoptimizeIf(ne, instr, "minus zero", scratch, Operand(zero_reg));
|
| }
|
| __ bind(&done);
|
| }
|
| @@ -3893,7 +3900,7 @@ void LCodeGen::DoPower(LPower* instr) {
|
| DCHECK(!a7.is(tagged_exponent));
|
| __ lw(a7, FieldMemOperand(tagged_exponent, HeapObject::kMapOffset));
|
| __ LoadRoot(at, Heap::kHeapNumberMapRootIndex);
|
| - DeoptimizeIf(ne, instr, a7, Operand(at));
|
| + DeoptimizeIf(ne, instr, "not a heap number", a7, Operand(at));
|
| __ bind(&no_deopt);
|
| MathPowStub stub(isolate(), MathPowStub::TAGGED);
|
| __ CallStub(&stub);
|
| @@ -4235,7 +4242,7 @@ void LCodeGen::DoBoundsCheck(LBoundsCheck* instr) {
|
| __ stop("eliminated bounds check failed");
|
| __ bind(&done);
|
| } else {
|
| - DeoptimizeIf(cc, instr, reg, operand);
|
| + DeoptimizeIf(cc, instr, "out of bounds", reg, operand);
|
| }
|
| }
|
|
|
| @@ -4526,7 +4533,7 @@ void LCodeGen::DoTrapAllocationMemento(LTrapAllocationMemento* instr) {
|
| Label no_memento_found;
|
| __ TestJSArrayForAllocationMemento(object, temp, &no_memento_found,
|
| ne, &no_memento_found);
|
| - DeoptimizeIf(al, instr);
|
| + DeoptimizeIf(al, instr, "memento found");
|
| __ bind(&no_memento_found);
|
| }
|
|
|
| @@ -4829,12 +4836,12 @@ void LCodeGen::DoSmiTag(LSmiTag* instr) {
|
| if (hchange->CheckFlag(HValue::kCanOverflow) &&
|
| hchange->value()->CheckFlag(HValue::kUint32)) {
|
| __ And(at, input, Operand(0x80000000));
|
| - DeoptimizeIf(ne, instr, at, Operand(zero_reg));
|
| + DeoptimizeIf(ne, instr, "overflow", at, Operand(zero_reg));
|
| }
|
| if (hchange->CheckFlag(HValue::kCanOverflow) &&
|
| !hchange->value()->CheckFlag(HValue::kUint32)) {
|
| __ SmiTagCheckOverflow(output, input, at);
|
| - DeoptimizeIf(lt, instr, at, Operand(zero_reg));
|
| + DeoptimizeIf(lt, instr, "overflow", at, Operand(zero_reg));
|
| } else {
|
| __ SmiTag(output, input);
|
| }
|
| @@ -4850,7 +4857,7 @@ void LCodeGen::DoSmiUntag(LSmiUntag* instr) {
|
| // If the input is a HeapObject, value of scratch won't be zero.
|
| __ And(scratch, input, Operand(kHeapObjectTag));
|
| __ SmiUntag(result, input);
|
| - DeoptimizeIf(ne, instr, scratch, Operand(zero_reg));
|
| + DeoptimizeIf(ne, instr, "not a Smi", scratch, Operand(zero_reg));
|
| } else {
|
| __ SmiUntag(result, input);
|
| }
|
| @@ -4875,7 +4882,7 @@ void LCodeGen::EmitNumberUntagD(LNumberUntagD* instr, Register input_reg,
|
| if (can_convert_undefined_to_nan) {
|
| __ Branch(&convert, ne, scratch, Operand(at));
|
| } else {
|
| - DeoptimizeIf(ne, instr, scratch, Operand(at));
|
| + DeoptimizeIf(ne, instr, "not a heap number", scratch, Operand(at));
|
| }
|
| // Load heap number.
|
| __ ldc1(result_reg, FieldMemOperand(input_reg, HeapNumber::kValueOffset));
|
| @@ -4883,14 +4890,16 @@ void LCodeGen::EmitNumberUntagD(LNumberUntagD* instr, Register input_reg,
|
| __ mfc1(at, result_reg);
|
| __ Branch(&done, ne, at, Operand(zero_reg));
|
| __ mfhc1(scratch, result_reg); // Get exponent/sign bits.
|
| - DeoptimizeIf(eq, instr, scratch, Operand(HeapNumber::kSignMask));
|
| + DeoptimizeIf(eq, instr, "minus zero", scratch,
|
| + Operand(HeapNumber::kSignMask));
|
| }
|
| __ Branch(&done);
|
| if (can_convert_undefined_to_nan) {
|
| __ bind(&convert);
|
| // Convert undefined (and hole) to NaN.
|
| __ LoadRoot(at, Heap::kUndefinedValueRootIndex);
|
| - DeoptimizeIf(ne, instr, input_reg, Operand(at));
|
| + DeoptimizeIf(ne, instr, "not a heap number/undefined", input_reg,
|
| + Operand(at));
|
| __ LoadRoot(scratch, Heap::kNanValueRootIndex);
|
| __ ldc1(result_reg, FieldMemOperand(scratch, HeapNumber::kValueOffset));
|
| __ Branch(&done);
|
| @@ -4954,11 +4963,12 @@ void LCodeGen::DoDeferredTaggedToI(LTaggedToI* instr) {
|
|
|
| __ bind(&check_false);
|
| __ LoadRoot(at, Heap::kFalseValueRootIndex);
|
| - DeoptimizeIf(ne, instr, scratch2, Operand(at), "cannot truncate");
|
| + DeoptimizeIf(ne, instr, "not a heap number/undefined/true/false", scratch2,
|
| + Operand(at));
|
| __ Branch(USE_DELAY_SLOT, &done);
|
| __ mov(input_reg, zero_reg); // In delay slot.
|
| } else {
|
| - DeoptimizeIf(ne, instr, scratch1, Operand(at), "not a heap number");
|
| + DeoptimizeIf(ne, instr, "not a heap number", scratch1, Operand(at));
|
|
|
| // Load the double value.
|
| __ ldc1(double_scratch,
|
| @@ -4973,15 +4983,15 @@ void LCodeGen::DoDeferredTaggedToI(LTaggedToI* instr) {
|
| except_flag,
|
| kCheckForInexactConversion);
|
|
|
| - DeoptimizeIf(ne, instr, except_flag, Operand(zero_reg),
|
| - "lost precision or NaN");
|
| + DeoptimizeIf(ne, instr, "lost precision or NaN", except_flag,
|
| + Operand(zero_reg));
|
|
|
| if (instr->hydrogen()->CheckFlag(HValue::kBailoutOnMinusZero)) {
|
| __ Branch(&done, ne, input_reg, Operand(zero_reg));
|
|
|
| __ mfhc1(scratch1, double_scratch); // Get exponent/sign bits.
|
| __ And(scratch1, scratch1, Operand(HeapNumber::kSignMask));
|
| - DeoptimizeIf(ne, instr, scratch1, Operand(zero_reg), "minus zero");
|
| + DeoptimizeIf(ne, instr, "minus zero", scratch1, Operand(zero_reg));
|
| }
|
| }
|
| __ bind(&done);
|
| @@ -5058,14 +5068,15 @@ void LCodeGen::DoDoubleToI(LDoubleToI* instr) {
|
| kCheckForInexactConversion);
|
|
|
| // Deopt if the operation did not succeed (except_flag != 0).
|
| - DeoptimizeIf(ne, instr, except_flag, Operand(zero_reg));
|
| + DeoptimizeIf(ne, instr, "lost precision or NaN", except_flag,
|
| + Operand(zero_reg));
|
|
|
| if (instr->hydrogen()->CheckFlag(HValue::kBailoutOnMinusZero)) {
|
| Label done;
|
| __ Branch(&done, ne, result_reg, Operand(zero_reg));
|
| __ mfhc1(scratch1, double_input); // Get exponent/sign bits.
|
| __ And(scratch1, scratch1, Operand(HeapNumber::kSignMask));
|
| - DeoptimizeIf(ne, instr, scratch1, Operand(zero_reg));
|
| + DeoptimizeIf(ne, instr, "minus zero", scratch1, Operand(zero_reg));
|
| __ bind(&done);
|
| }
|
| }
|
| @@ -5091,14 +5102,15 @@ void LCodeGen::DoDoubleToSmi(LDoubleToSmi* instr) {
|
| kCheckForInexactConversion);
|
|
|
| // Deopt if the operation did not succeed (except_flag != 0).
|
| - DeoptimizeIf(ne, instr, except_flag, Operand(zero_reg));
|
| + DeoptimizeIf(ne, instr, "lost precision or NaN", except_flag,
|
| + Operand(zero_reg));
|
|
|
| if (instr->hydrogen()->CheckFlag(HValue::kBailoutOnMinusZero)) {
|
| Label done;
|
| __ Branch(&done, ne, result_reg, Operand(zero_reg));
|
| __ mfhc1(scratch1, double_input); // Get exponent/sign bits.
|
| __ And(scratch1, scratch1, Operand(HeapNumber::kSignMask));
|
| - DeoptimizeIf(ne, instr, scratch1, Operand(zero_reg));
|
| + DeoptimizeIf(ne, instr, "minus zero", scratch1, Operand(zero_reg));
|
| __ bind(&done);
|
| }
|
| }
|
| @@ -5109,7 +5121,7 @@ void LCodeGen::DoDoubleToSmi(LDoubleToSmi* instr) {
|
| void LCodeGen::DoCheckSmi(LCheckSmi* instr) {
|
| LOperand* input = instr->value();
|
| __ SmiTst(ToRegister(input), at);
|
| - DeoptimizeIf(ne, instr, at, Operand(zero_reg));
|
| + DeoptimizeIf(ne, instr, "not a Smi", at, Operand(zero_reg));
|
| }
|
|
|
|
|
| @@ -5117,7 +5129,7 @@ void LCodeGen::DoCheckNonSmi(LCheckNonSmi* instr) {
|
| if (!instr->hydrogen()->value()->type().IsHeapObject()) {
|
| LOperand* input = instr->value();
|
| __ SmiTst(ToRegister(input), at);
|
| - DeoptimizeIf(eq, instr, at, Operand(zero_reg));
|
| + DeoptimizeIf(eq, instr, "Smi", at, Operand(zero_reg));
|
| }
|
| }
|
|
|
| @@ -5135,12 +5147,12 @@ void LCodeGen::DoCheckInstanceType(LCheckInstanceType* instr) {
|
|
|
| // If there is only one type in the interval check for equality.
|
| if (first == last) {
|
| - DeoptimizeIf(ne, instr, scratch, Operand(first));
|
| + DeoptimizeIf(ne, instr, "wrong instance type", scratch, Operand(first));
|
| } else {
|
| - DeoptimizeIf(lo, instr, scratch, Operand(first));
|
| + DeoptimizeIf(lo, instr, "wrong instance type", scratch, Operand(first));
|
| // Omit check for the last type.
|
| if (last != LAST_TYPE) {
|
| - DeoptimizeIf(hi, instr, scratch, Operand(last));
|
| + DeoptimizeIf(hi, instr, "wrong instance type", scratch, Operand(last));
|
| }
|
| }
|
| } else {
|
| @@ -5151,10 +5163,11 @@ void LCodeGen::DoCheckInstanceType(LCheckInstanceType* instr) {
|
| if (base::bits::IsPowerOfTwo32(mask)) {
|
| DCHECK(tag == 0 || base::bits::IsPowerOfTwo32(tag));
|
| __ And(at, scratch, mask);
|
| - DeoptimizeIf(tag == 0 ? ne : eq, instr, at, Operand(zero_reg));
|
| + DeoptimizeIf(tag == 0 ? ne : eq, instr, "wrong instance type", at,
|
| + Operand(zero_reg));
|
| } else {
|
| __ And(scratch, scratch, Operand(mask));
|
| - DeoptimizeIf(ne, instr, scratch, Operand(tag));
|
| + DeoptimizeIf(ne, instr, "wrong instance type", scratch, Operand(tag));
|
| }
|
| }
|
| }
|
| @@ -5169,9 +5182,9 @@ void LCodeGen::DoCheckValue(LCheckValue* instr) {
|
| Handle<Cell> cell = isolate()->factory()->NewCell(object);
|
| __ li(at, Operand(Handle<Object>(cell)));
|
| __ ld(at, FieldMemOperand(at, Cell::kValueOffset));
|
| - DeoptimizeIf(ne, instr, reg, Operand(at));
|
| + DeoptimizeIf(ne, instr, "value mismatch", reg, Operand(at));
|
| } else {
|
| - DeoptimizeIf(ne, instr, reg, Operand(object));
|
| + DeoptimizeIf(ne, instr, "value mismatch", reg, Operand(object));
|
| }
|
| }
|
|
|
| @@ -5187,7 +5200,7 @@ void LCodeGen::DoDeferredInstanceMigration(LCheckMaps* instr, Register object) {
|
| __ StoreToSafepointRegisterSlot(v0, scratch0());
|
| }
|
| __ SmiTst(scratch0(), at);
|
| - DeoptimizeIf(eq, instr, at, Operand(zero_reg));
|
| + DeoptimizeIf(eq, instr, "instance migration failed", at, Operand(zero_reg));
|
| }
|
|
|
|
|
| @@ -5240,7 +5253,7 @@ void LCodeGen::DoCheckMaps(LCheckMaps* instr) {
|
| if (instr->hydrogen()->HasMigrationTarget()) {
|
| __ Branch(deferred->entry(), ne, map_reg, Operand(map));
|
| } else {
|
| - DeoptimizeIf(ne, instr, map_reg, Operand(map));
|
| + DeoptimizeIf(ne, instr, "wrong map", map_reg, Operand(map));
|
| }
|
|
|
| __ bind(&success);
|
| @@ -5278,7 +5291,8 @@ void LCodeGen::DoClampTToUint8(LClampTToUint8* instr) {
|
|
|
| // Check for undefined. Undefined is converted to zero for clamping
|
| // conversions.
|
| - DeoptimizeIf(ne, instr, input_reg, Operand(factory()->undefined_value()));
|
| + DeoptimizeIf(ne, instr, "not a heap number/undefined", input_reg,
|
| + Operand(factory()->undefined_value()));
|
| __ mov(result_reg, zero_reg);
|
| __ jmp(&done);
|
|
|
| @@ -5703,8 +5717,8 @@ void LCodeGen::DoDeoptimize(LDeoptimize* instr) {
|
| type = Deoptimizer::LAZY;
|
| }
|
|
|
| - DeoptimizeIf(al, instr, type, zero_reg, Operand(zero_reg),
|
| - instr->hydrogen()->reason());
|
| + DeoptimizeIf(al, instr, type, instr->hydrogen()->reason(), zero_reg,
|
| + Operand(zero_reg));
|
| }
|
|
|
|
|
| @@ -5795,18 +5809,19 @@ void LCodeGen::DoForInPrepareMap(LForInPrepareMap* instr) {
|
| Register result = ToRegister(instr->result());
|
| Register object = ToRegister(instr->object());
|
| __ LoadRoot(at, Heap::kUndefinedValueRootIndex);
|
| - DeoptimizeIf(eq, instr, object, Operand(at));
|
| + DeoptimizeIf(eq, instr, "undefined", object, Operand(at));
|
|
|
| Register null_value = a5;
|
| __ LoadRoot(null_value, Heap::kNullValueRootIndex);
|
| - DeoptimizeIf(eq, instr, object, Operand(null_value));
|
| + DeoptimizeIf(eq, instr, "null", object, Operand(null_value));
|
|
|
| __ And(at, object, kSmiTagMask);
|
| - DeoptimizeIf(eq, instr, at, Operand(zero_reg));
|
| + DeoptimizeIf(eq, instr, "Smi", at, Operand(zero_reg));
|
|
|
| STATIC_ASSERT(FIRST_JS_PROXY_TYPE == FIRST_SPEC_OBJECT_TYPE);
|
| __ GetObjectType(object, a1, a1);
|
| - DeoptimizeIf(le, instr, a1, Operand(LAST_JS_PROXY_TYPE));
|
| + DeoptimizeIf(le, instr, "not a JavaScript object", a1,
|
| + Operand(LAST_JS_PROXY_TYPE));
|
|
|
| Label use_cache, call_runtime;
|
| DCHECK(object.is(a0));
|
| @@ -5823,7 +5838,7 @@ void LCodeGen::DoForInPrepareMap(LForInPrepareMap* instr) {
|
| __ ld(a1, FieldMemOperand(v0, HeapObject::kMapOffset));
|
| DCHECK(result.is(v0));
|
| __ LoadRoot(at, Heap::kMetaMapRootIndex);
|
| - DeoptimizeIf(ne, instr, a1, Operand(at));
|
| + DeoptimizeIf(ne, instr, "wrong map", a1, Operand(at));
|
| __ bind(&use_cache);
|
| }
|
|
|
| @@ -5843,7 +5858,7 @@ void LCodeGen::DoForInCacheArray(LForInCacheArray* instr) {
|
| FieldMemOperand(result, DescriptorArray::kEnumCacheOffset));
|
| __ ld(result,
|
| FieldMemOperand(result, FixedArray::SizeFor(instr->idx())));
|
| - DeoptimizeIf(eq, instr, result, Operand(zero_reg));
|
| + DeoptimizeIf(eq, instr, "no cache", result, Operand(zero_reg));
|
|
|
| __ bind(&done);
|
| }
|
| @@ -5853,7 +5868,7 @@ void LCodeGen::DoCheckMapValue(LCheckMapValue* instr) {
|
| Register object = ToRegister(instr->value());
|
| Register map = ToRegister(instr->map());
|
| __ ld(scratch0(), FieldMemOperand(object, HeapObject::kMapOffset));
|
| - DeoptimizeIf(ne, instr, map, Operand(scratch0()));
|
| + DeoptimizeIf(ne, instr, "wrong map", map, Operand(scratch0()));
|
| }
|
|
|
|
|
|
|