Index: src/arm/code-stubs-arm.cc |
diff --git a/src/arm/code-stubs-arm.cc b/src/arm/code-stubs-arm.cc |
index d776b08c656159521a78bc6b1e73ae795f5c3e58..b4b9e3a20c5e3a635048c836758a154263911cb6 100644 |
--- a/src/arm/code-stubs-arm.cc |
+++ b/src/arm/code-stubs-arm.cc |
@@ -92,9 +92,8 @@ void InternalArrayNArgumentsConstructorStub::InitializeDescriptor( |
#define __ ACCESS_MASM(masm) |
- |
static void EmitIdenticalObjectComparison(MacroAssembler* masm, Label* slow, |
- Condition cond, Strength strength); |
+ Condition cond); |
static void EmitSmiNonsmiComparison(MacroAssembler* masm, |
Register lhs, |
Register rhs, |
@@ -238,7 +237,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 cond, Strength strength) { |
+ Condition cond) { |
Label not_identical; |
Label heap_number, return_equal; |
__ cmp(r0, r1); |
@@ -258,14 +257,6 @@ static void EmitIdenticalObjectComparison(MacroAssembler* masm, Label* slow, |
// Call runtime on identical SIMD values since we must throw a TypeError. |
__ cmp(r4, Operand(SIMD128_VALUE_TYPE)); |
__ b(eq, slow); |
- 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. |
- __ cmp(r4, Operand(HEAP_NUMBER_TYPE)); |
- __ b(eq, &return_equal); |
- __ tst(r4, Operand(kIsNotStringMask)); |
- __ b(ne, slow); |
- } |
} else { |
__ CompareObjectType(r0, r4, r4, HEAP_NUMBER_TYPE); |
__ b(eq, &heap_number); |
@@ -279,13 +270,6 @@ static void EmitIdenticalObjectComparison(MacroAssembler* masm, Label* slow, |
// Call runtime on identical SIMD values since we must throw a TypeError. |
__ cmp(r4, Operand(SIMD128_VALUE_TYPE)); |
__ b(eq, slow); |
- 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. |
- __ tst(r4, Operand(kIsNotStringMask)); |
- __ b(ne, slow); |
- } |
// Normally here we fall through to return_equal, but undefined is |
// special: (undefined == undefined) == true, but |
// (undefined <= undefined) == false! See ECMAScript 11.8.5. |
@@ -591,7 +575,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. |
@@ -704,8 +688,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); |
@@ -2932,18 +2915,14 @@ void CompareICStub::GenerateBooleans(MacroAssembler* masm) { |
__ CheckMap(r1, r2, Heap::kBooleanMapRootIndex, &miss, DO_SMI_CHECK); |
__ CheckMap(r0, r3, Heap::kBooleanMapRootIndex, &miss, DO_SMI_CHECK); |
- if (op() != Token::EQ_STRICT && is_strong(strength())) { |
- __ TailCallRuntime(Runtime::kThrowStrongModeImplicitConversion); |
- } else { |
- if (!Token::IsEqualityOp(op())) { |
- __ ldr(r1, FieldMemOperand(r1, Oddball::kToNumberOffset)); |
- __ AssertSmi(r1); |
- __ ldr(r0, FieldMemOperand(r0, Oddball::kToNumberOffset)); |
- __ AssertSmi(r0); |
- } |
- __ sub(r0, r1, r0); |
- __ Ret(); |
+ if (!Token::IsEqualityOp(op())) { |
+ __ ldr(r1, FieldMemOperand(r1, Oddball::kToNumberOffset)); |
+ __ AssertSmi(r1); |
+ __ ldr(r0, FieldMemOperand(r0, Oddball::kToNumberOffset)); |
+ __ AssertSmi(r0); |
} |
+ __ sub(r0, r1, r0); |
+ __ Ret(); |
__ bind(&miss); |
GenerateMiss(masm); |
@@ -3023,7 +3002,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); |
@@ -3241,8 +3220,6 @@ void CompareICStub::GenerateKnownReceivers(MacroAssembler* masm) { |
if (Token::IsEqualityOp(op())) { |
__ sub(r0, r0, Operand(r1)); |
__ Ret(); |
- } else if (is_strong(strength())) { |
- __ TailCallRuntime(Runtime::kThrowStrongModeImplicitConversion); |
} else { |
if (op() == Token::LT || op() == Token::LTE) { |
__ mov(r2, Operand(Smi::FromInt(GREATER))); |