| Index: src/ppc/code-stubs-ppc.cc
|
| diff --git a/src/ppc/code-stubs-ppc.cc b/src/ppc/code-stubs-ppc.cc
|
| index 8cfb69b8e7bb886b331f165ca7d6a4cea0a89eaa..66d5cb3cb8747cb810ced0da5b64eb9cad9773d2 100644
|
| --- a/src/ppc/code-stubs-ppc.cc
|
| +++ b/src/ppc/code-stubs-ppc.cc
|
| @@ -91,9 +91,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, Label* lhs_not_nan,
|
| Label* slow, bool strict);
|
| @@ -248,7 +247,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(r3, r4);
|
| @@ -268,14 +267,6 @@ static void EmitIdenticalObjectComparison(MacroAssembler* masm, Label* slow,
|
| // Call runtime on identical SIMD values since we must throw a TypeError.
|
| __ cmpi(r7, Operand(SIMD128_VALUE_TYPE));
|
| __ beq(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.
|
| - __ cmpi(r7, Operand(HEAP_NUMBER_TYPE));
|
| - __ beq(&return_equal);
|
| - __ andi(r0, r7, Operand(kIsNotStringMask));
|
| - __ bne(slow, cr0);
|
| - }
|
| } else {
|
| __ CompareObjectType(r3, r7, r7, HEAP_NUMBER_TYPE);
|
| __ beq(&heap_number);
|
| @@ -289,13 +280,6 @@ static void EmitIdenticalObjectComparison(MacroAssembler* masm, Label* slow,
|
| // Call runtime on identical SIMD values since we must throw a TypeError.
|
| __ cmpi(r7, Operand(SIMD128_VALUE_TYPE));
|
| __ beq(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.
|
| - __ andi(r0, r7, Operand(kIsNotStringMask));
|
| - __ bne(slow, cr0);
|
| - }
|
| // Normally here we fall through to return_equal, but undefined is
|
| // special: (undefined == undefined) == true, but
|
| // (undefined <= undefined) == false! See ECMAScript 11.8.5.
|
| @@ -609,7 +593,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.
|
| @@ -731,8 +715,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);
|
| @@ -3025,18 +3008,14 @@ void CompareICStub::GenerateBooleans(MacroAssembler* masm) {
|
|
|
| __ CheckMap(r4, r5, Heap::kBooleanMapRootIndex, &miss, DO_SMI_CHECK);
|
| __ CheckMap(r3, r6, Heap::kBooleanMapRootIndex, &miss, DO_SMI_CHECK);
|
| - if (op() != Token::EQ_STRICT && is_strong(strength())) {
|
| - __ TailCallRuntime(Runtime::kThrowStrongModeImplicitConversion);
|
| - } else {
|
| - if (!Token::IsEqualityOp(op())) {
|
| - __ LoadP(r4, FieldMemOperand(r4, Oddball::kToNumberOffset));
|
| - __ AssertSmi(r4);
|
| - __ LoadP(r3, FieldMemOperand(r3, Oddball::kToNumberOffset));
|
| - __ AssertSmi(r3);
|
| - }
|
| - __ sub(r3, r4, r3);
|
| - __ Ret();
|
| + if (!Token::IsEqualityOp(op())) {
|
| + __ LoadP(r4, FieldMemOperand(r4, Oddball::kToNumberOffset));
|
| + __ AssertSmi(r4);
|
| + __ LoadP(r3, FieldMemOperand(r3, Oddball::kToNumberOffset));
|
| + __ AssertSmi(r3);
|
| }
|
| + __ sub(r3, r4, r3);
|
| + __ Ret();
|
|
|
| __ bind(&miss);
|
| GenerateMiss(masm);
|
| @@ -3134,7 +3113,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);
|
|
|
| @@ -3357,8 +3336,6 @@ void CompareICStub::GenerateKnownReceivers(MacroAssembler* masm) {
|
| if (Token::IsEqualityOp(op())) {
|
| __ sub(r3, r3, r4);
|
| __ Ret();
|
| - } else if (is_strong(strength())) {
|
| - __ TailCallRuntime(Runtime::kThrowStrongModeImplicitConversion);
|
| } else {
|
| if (op() == Token::LT || op() == Token::LTE) {
|
| __ LoadSmiLiteral(r5, Smi::FromInt(GREATER));
|
|
|