| Index: src/arm/code-stubs-arm.cc
|
| diff --git a/src/arm/code-stubs-arm.cc b/src/arm/code-stubs-arm.cc
|
| index 907bdaced336b68694235a862ad279cd878ac641..f6b08bd87c0d8513dc6101df76e4b2072deb2a65 100644
|
| --- a/src/arm/code-stubs-arm.cc
|
| +++ b/src/arm/code-stubs-arm.cc
|
| @@ -681,26 +681,22 @@ void CompareICStub::GenerateGeneric(MacroAssembler* masm) {
|
|
|
| __ Push(lhs, rhs);
|
| // Figure out which native to call and setup the arguments.
|
| - if (cc == eq && strict()) {
|
| - __ TailCallRuntime(Runtime::kStrictEquals, 2, 1);
|
| + if (cc == eq) {
|
| + __ TailCallRuntime(strict() ? Runtime::kStrictEquals : Runtime::kEquals, 2,
|
| + 1);
|
| } else {
|
| - int context_index;
|
| - if (cc == eq) {
|
| - context_index = Context::EQUALS_BUILTIN_INDEX;
|
| + int context_index = is_strong(strength())
|
| + ? Context::COMPARE_STRONG_BUILTIN_INDEX
|
| + : Context::COMPARE_BUILTIN_INDEX;
|
| + int ncr; // NaN compare result
|
| + if (cc == lt || cc == le) {
|
| + ncr = GREATER;
|
| } else {
|
| - context_index = is_strong(strength())
|
| - ? Context::COMPARE_STRONG_BUILTIN_INDEX
|
| - : Context::COMPARE_BUILTIN_INDEX;
|
| - int ncr; // NaN compare result
|
| - if (cc == lt || cc == le) {
|
| - ncr = GREATER;
|
| - } else {
|
| - DCHECK(cc == gt || cc == ge); // remaining cases
|
| - ncr = LESS;
|
| - }
|
| - __ mov(r0, Operand(Smi::FromInt(ncr)));
|
| - __ push(r0);
|
| + DCHECK(cc == gt || cc == ge); // remaining cases
|
| + ncr = LESS;
|
| }
|
| + __ mov(r0, Operand(Smi::FromInt(ncr)));
|
| + __ push(r0);
|
|
|
| // Call the native; it returns -1 (less), 0 (equal), or 1 (greater)
|
| // tagged as a small integer.
|
|
|