| Index: src/arm64/code-stubs-arm64.cc
|
| diff --git a/src/arm64/code-stubs-arm64.cc b/src/arm64/code-stubs-arm64.cc
|
| index 5e0778ebad65002224a1c5eace54c2ff8f475d29..bd701502efc5c3a5a4716edc36f667126d805bd8 100644
|
| --- a/src/arm64/code-stubs-arm64.cc
|
| +++ b/src/arm64/code-stubs-arm64.cc
|
| @@ -207,7 +207,7 @@ static void EmitIdenticalObjectComparison(MacroAssembler* masm, Register left,
|
| Register right, Register scratch,
|
| FPRegister double_scratch,
|
| Label* slow, Condition cond,
|
| - bool strong) {
|
| + Strength strength) {
|
| DCHECK(!AreAliased(left, right, scratch));
|
| Label not_identical, return_equal, heap_number;
|
| Register result = x0;
|
| @@ -227,7 +227,7 @@ static void EmitIdenticalObjectComparison(MacroAssembler* masm, Register left,
|
| // Call runtime on identical symbols since we need to throw a TypeError.
|
| __ Cmp(right_type, 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(right_type, Operand(HEAP_NUMBER_TYPE));
|
| @@ -246,7 +246,7 @@ static void EmitIdenticalObjectComparison(MacroAssembler* masm, Register left,
|
| // Call runtime on identical symbols since we need to throw a TypeError.
|
| __ Cmp(right_type, 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.
|
| @@ -529,7 +529,8 @@ 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, lhs, rhs, x10, d0, &slow, cond, strong());
|
| + EmitIdenticalObjectComparison(masm, lhs, rhs, x10, d0, &slow, cond,
|
| + strength());
|
|
|
| // If either is a smi (we know that at least one is not a smi), then they can
|
| // only be strictly equal if the other is a HeapNumber.
|
| @@ -648,7 +649,8 @@ void CompareICStub::GenerateGeneric(MacroAssembler* masm) {
|
| if (cond == 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 ((cond == lt) || (cond == le)) {
|
| ncr = GREATER;
|
| @@ -3502,7 +3504,7 @@ void CompareICStub::GenerateNumbers(MacroAssembler* masm) {
|
| __ Ret();
|
|
|
| __ Bind(&unordered);
|
| - CompareICStub stub(isolate(), op(), strong(), CompareICState::GENERIC,
|
| + CompareICStub stub(isolate(), op(), strength(), CompareICState::GENERIC,
|
| CompareICState::GENERIC, CompareICState::GENERIC);
|
| __ Jump(stub.GetCode(), RelocInfo::CODE_TARGET);
|
|
|
|
|