| Index: src/mips/code-stubs-mips.cc
|
| diff --git a/src/mips/code-stubs-mips.cc b/src/mips/code-stubs-mips.cc
|
| index cc1ff0f4824c3714554f8a90adf87ec0671c0149..0792403885318010b362929c9f396f8b987d9f12 100644
|
| --- a/src/mips/code-stubs-mips.cc
|
| +++ b/src/mips/code-stubs-mips.cc
|
| @@ -91,9 +91,8 @@ void InternalArrayNArgumentsConstructorStub::InitializeDescriptor(
|
|
|
| #define __ ACCESS_MASM(masm)
|
|
|
| -
|
| static void EmitIdenticalObjectComparison(MacroAssembler* masm, Label* slow,
|
| - Condition cc, Strength strength);
|
| + Condition cc);
|
| static void EmitSmiNonsmiComparison(MacroAssembler* masm,
|
| Register lhs,
|
| Register rhs,
|
| @@ -275,7 +274,7 @@ void DoubleToIStub::Generate(MacroAssembler* masm) {
|
| // Equality is almost reflexive (everything but NaN), so this is a test
|
| // for "identity and not NaN".
|
| static void EmitIdenticalObjectComparison(MacroAssembler* masm, Label* slow,
|
| - Condition cc, Strength strength) {
|
| + Condition cc) {
|
| Label not_identical;
|
| Label heap_number, return_equal;
|
| Register exp_mask_reg = t5;
|
| @@ -296,29 +295,15 @@ static void EmitIdenticalObjectComparison(MacroAssembler* masm, Label* slow,
|
| __ Branch(slow, eq, t4, Operand(SYMBOL_TYPE));
|
| // Call runtime on identical SIMD values since we must throw a TypeError.
|
| __ Branch(slow, eq, t4, Operand(SIMD128_VALUE_TYPE));
|
| - if (is_strong(strength)) {
|
| - // Call the runtime on anything that is converted in the semantics, since
|
| - // we need to throw a TypeError. Smis have already been ruled out.
|
| - __ Branch(&return_equal, eq, t4, Operand(HEAP_NUMBER_TYPE));
|
| - __ And(t4, t4, Operand(kIsNotStringMask));
|
| - __ Branch(slow, ne, t4, Operand(zero_reg));
|
| - }
|
| } else {
|
| __ Branch(&heap_number, eq, t4, Operand(HEAP_NUMBER_TYPE));
|
| // Comparing JS objects with <=, >= is complicated.
|
| if (cc != eq) {
|
| - __ Branch(slow, greater, t4, Operand(FIRST_JS_RECEIVER_TYPE));
|
| - // Call runtime on identical symbols since we need to throw a TypeError.
|
| - __ Branch(slow, eq, t4, Operand(SYMBOL_TYPE));
|
| - // Call runtime on identical SIMD values since we must throw a TypeError.
|
| - __ Branch(slow, eq, t4, Operand(SIMD128_VALUE_TYPE));
|
| - if (is_strong(strength)) {
|
| - // Call the runtime on anything that is converted in the semantics,
|
| - // since we need to throw a TypeError. Smis and heap numbers have
|
| - // already been ruled out.
|
| - __ And(t4, t4, Operand(kIsNotStringMask));
|
| - __ Branch(slow, ne, t4, Operand(zero_reg));
|
| - }
|
| + __ Branch(slow, greater, t4, Operand(FIRST_JS_RECEIVER_TYPE));
|
| + // Call runtime on identical symbols since we need to throw a TypeError.
|
| + __ Branch(slow, eq, t4, Operand(SYMBOL_TYPE));
|
| + // Call runtime on identical SIMD values since we must throw a TypeError.
|
| + __ Branch(slow, eq, t4, Operand(SIMD128_VALUE_TYPE));
|
| // Normally here we fall through to return_equal, but undefined is
|
| // special: (undefined == undefined) == true, but
|
| // (undefined <= undefined) == false! See ECMAScript 11.8.5.
|
| @@ -613,7 +598,7 @@ void CompareICStub::GenerateGeneric(MacroAssembler* masm) {
|
|
|
| // Handle the case where the objects are identical. Either returns the answer
|
| // or goes to slow. Only falls through if the objects were not identical.
|
| - EmitIdenticalObjectComparison(masm, &slow, cc, strength());
|
| + EmitIdenticalObjectComparison(masm, &slow, cc);
|
|
|
| // If either is a Smi (we know that not both are), then they can only
|
| // be strictly equal if the other is a HeapNumber.
|
| @@ -752,8 +737,7 @@ void CompareICStub::GenerateGeneric(MacroAssembler* masm) {
|
|
|
| // Call the native; it returns -1 (less), 0 (equal), or 1 (greater)
|
| // tagged as a small integer.
|
| - __ TailCallRuntime(is_strong(strength()) ? Runtime::kCompare_Strong
|
| - : Runtime::kCompare);
|
| + __ TailCallRuntime(Runtime::kCompare);
|
| }
|
|
|
| __ bind(&miss);
|
| @@ -3078,18 +3062,14 @@ void CompareICStub::GenerateBooleans(MacroAssembler* masm) {
|
|
|
| __ CheckMap(a1, a2, Heap::kBooleanMapRootIndex, &miss, DO_SMI_CHECK);
|
| __ CheckMap(a0, a3, Heap::kBooleanMapRootIndex, &miss, DO_SMI_CHECK);
|
| - if (op() != Token::EQ_STRICT && is_strong(strength())) {
|
| - __ TailCallRuntime(Runtime::kThrowStrongModeImplicitConversion);
|
| - } else {
|
| - if (!Token::IsEqualityOp(op())) {
|
| - __ lw(a1, FieldMemOperand(a1, Oddball::kToNumberOffset));
|
| - __ AssertSmi(a1);
|
| - __ lw(a0, FieldMemOperand(a0, Oddball::kToNumberOffset));
|
| - __ AssertSmi(a0);
|
| - }
|
| - __ Ret(USE_DELAY_SLOT);
|
| - __ Subu(v0, a1, a0);
|
| + if (!Token::IsEqualityOp(op())) {
|
| + __ lw(a1, FieldMemOperand(a1, Oddball::kToNumberOffset));
|
| + __ AssertSmi(a1);
|
| + __ lw(a0, FieldMemOperand(a0, Oddball::kToNumberOffset));
|
| + __ AssertSmi(a0);
|
| }
|
| + __ Ret(USE_DELAY_SLOT);
|
| + __ Subu(v0, a1, a0);
|
|
|
| __ bind(&miss);
|
| GenerateMiss(masm);
|
| @@ -3187,7 +3167,7 @@ void CompareICStub::GenerateNumbers(MacroAssembler* masm) {
|
|
|
| __ bind(&unordered);
|
| __ bind(&generic_stub);
|
| - CompareICStub stub(isolate(), op(), strength(), CompareICState::GENERIC,
|
| + CompareICStub stub(isolate(), op(), CompareICState::GENERIC,
|
| CompareICState::GENERIC, CompareICState::GENERIC);
|
| __ Jump(stub.GetCode(), RelocInfo::CODE_TARGET);
|
|
|
| @@ -3417,8 +3397,6 @@ void CompareICStub::GenerateKnownReceivers(MacroAssembler* masm) {
|
| if (Token::IsEqualityOp(op())) {
|
| __ Ret(USE_DELAY_SLOT);
|
| __ subu(v0, a0, a1);
|
| - } else if (is_strong(strength())) {
|
| - __ TailCallRuntime(Runtime::kThrowStrongModeImplicitConversion);
|
| } else {
|
| if (op() == Token::LT || op() == Token::LTE) {
|
| __ li(a2, Operand(Smi::FromInt(GREATER)));
|
|
|