| Index: src/arm/code-stubs-arm.cc
|
| diff --git a/src/arm/code-stubs-arm.cc b/src/arm/code-stubs-arm.cc
|
| index da06b1034c545db21d3863f34930450b60f138a8..35a7311d78aa2649b68dd9f3008b6b87b80f4a47 100644
|
| --- a/src/arm/code-stubs-arm.cc
|
| +++ b/src/arm/code-stubs-arm.cc
|
| @@ -94,7 +94,7 @@ void InternalArrayNArgumentsConstructorStub::InitializeDescriptor(
|
|
|
|
|
| static void EmitIdenticalObjectComparison(MacroAssembler* masm, Label* slow,
|
| - Condition cond, bool strong);
|
| + Condition cond, Strength strength);
|
| static void EmitSmiNonsmiComparison(MacroAssembler* masm,
|
| Register lhs,
|
| Register rhs,
|
| @@ -238,7 +238,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, bool strong) {
|
| + Condition cond, Strength strength) {
|
| Label not_identical;
|
| Label heap_number, return_equal;
|
| __ cmp(r0, r1);
|
| @@ -255,7 +255,7 @@ static void EmitIdenticalObjectComparison(MacroAssembler* masm, Label* slow,
|
| // Call runtime on identical symbols since we need to throw a TypeError.
|
| __ cmp(r4, Operand(SYMBOL_TYPE));
|
| __ b(eq, slow);
|
| - if (strong) {
|
| + 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));
|
| @@ -273,7 +273,7 @@ static void EmitIdenticalObjectComparison(MacroAssembler* masm, Label* slow,
|
| // Call runtime on identical symbols since we need to throw a TypeError.
|
| __ cmp(r4, Operand(SYMBOL_TYPE));
|
| __ b(eq, slow);
|
| - if (strong) {
|
| + 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.
|
| @@ -577,7 +577,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, strong());
|
| + EmitIdenticalObjectComparison(masm, &slow, cc, strength());
|
|
|
| // If either is a Smi (we know that not both are), then they can only
|
| // be strictly equal if the other is a HeapNumber.
|
| @@ -679,7 +679,8 @@ void CompareICStub::GenerateGeneric(MacroAssembler* masm) {
|
| if (cc == eq) {
|
| native = strict() ? Builtins::STRICT_EQUALS : Builtins::EQUALS;
|
| } else {
|
| - native = strong() ? Builtins::COMPARE_STRONG : Builtins::COMPARE;
|
| + native =
|
| + is_strong(strength()) ? Builtins::COMPARE_STRONG : Builtins::COMPARE;
|
| int ncr; // NaN compare result
|
| if (cc == lt || cc == le) {
|
| ncr = GREATER;
|
| @@ -3582,7 +3583,7 @@ void CompareICStub::GenerateNumbers(MacroAssembler* masm) {
|
|
|
| __ bind(&unordered);
|
| __ bind(&generic_stub);
|
| - CompareICStub stub(isolate(), op(), strong(), CompareICState::GENERIC,
|
| + CompareICStub stub(isolate(), op(), strength(), CompareICState::GENERIC,
|
| CompareICState::GENERIC, CompareICState::GENERIC);
|
| __ Jump(stub.GetCode(), RelocInfo::CODE_TARGET);
|
|
|
|
|