| Index: src/mips64/code-stubs-mips64.cc
|
| diff --git a/src/mips64/code-stubs-mips64.cc b/src/mips64/code-stubs-mips64.cc
|
| index a61ecfd468c5cb0be65af13f7719d2bd39379bc3..d12ec6fcda6e5eb5a1d48c793d3e93a49705670a 100644
|
| --- a/src/mips64/code-stubs-mips64.cc
|
| +++ b/src/mips64/code-stubs-mips64.cc
|
| @@ -90,9 +90,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,
|
| @@ -273,7 +272,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 = t1;
|
| @@ -294,13 +293,6 @@ static void EmitIdenticalObjectComparison(MacroAssembler* masm, Label* slow,
|
| __ Branch(slow, eq, t0, Operand(SYMBOL_TYPE));
|
| // Call runtime on identical SIMD values since we must throw a TypeError.
|
| __ Branch(slow, eq, t0, 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, t0, Operand(HEAP_NUMBER_TYPE));
|
| - __ And(t0, t0, Operand(kIsNotStringMask));
|
| - __ Branch(slow, ne, t0, Operand(zero_reg));
|
| - }
|
| } else {
|
| __ Branch(&heap_number, eq, t0, Operand(HEAP_NUMBER_TYPE));
|
| // Comparing JS objects with <=, >= is complicated.
|
| @@ -310,13 +302,6 @@ static void EmitIdenticalObjectComparison(MacroAssembler* masm, Label* slow,
|
| __ Branch(slow, eq, t0, Operand(SYMBOL_TYPE));
|
| // Call runtime on identical SIMD values since we must throw a TypeError.
|
| __ Branch(slow, eq, t0, 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(t0, t0, Operand(kIsNotStringMask));
|
| - __ Branch(slow, ne, t0, Operand(zero_reg));
|
| - }
|
| // Normally here we fall through to return_equal, but undefined is
|
| // special: (undefined == undefined) == true, but
|
| // (undefined <= undefined) == false! See ECMAScript 11.8.5.
|
| @@ -610,7 +595,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.
|
| @@ -749,8 +734,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);
|
| @@ -3082,18 +3066,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())) {
|
| - __ ld(a1, FieldMemOperand(a1, Oddball::kToNumberOffset));
|
| - __ AssertSmi(a1);
|
| - __ ld(a0, FieldMemOperand(a0, Oddball::kToNumberOffset));
|
| - __ AssertSmi(a0);
|
| - }
|
| - __ Ret(USE_DELAY_SLOT);
|
| - __ Dsubu(v0, a1, a0);
|
| + if (!Token::IsEqualityOp(op())) {
|
| + __ ld(a1, FieldMemOperand(a1, Oddball::kToNumberOffset));
|
| + __ AssertSmi(a1);
|
| + __ ld(a0, FieldMemOperand(a0, Oddball::kToNumberOffset));
|
| + __ AssertSmi(a0);
|
| }
|
| + __ Ret(USE_DELAY_SLOT);
|
| + __ Dsubu(v0, a1, a0);
|
|
|
| __ bind(&miss);
|
| GenerateMiss(masm);
|
| @@ -3191,7 +3171,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);
|
|
|
| @@ -3421,8 +3401,6 @@ void CompareICStub::GenerateKnownReceivers(MacroAssembler* masm) {
|
| if (Token::IsEqualityOp(op())) {
|
| __ Ret(USE_DELAY_SLOT);
|
| __ dsubu(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)));
|
|
|