Changeset 222523 in webkit for trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp

Timestamp:

Sep 26, 2017, 2:25:44 PM (8 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r222518.
​https://bugs.webkit.org/show_bug.cgi?id=177507

Break the High Sierra build (Requested by yusukesuzuki on
#webkit).

Reverted changeset:

"Add Above/Below comparisons for UInt32 patterns"
​https://bugs.webkit.org/show_bug.cgi?id=177281
​http://trac.webkit.org/changeset/222518

File:

• trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp

@@ -1982 +1982 @@
     OpcodeID opcodeID = this->opcodeID();
 
-    if (opcodeID == op_less || opcodeID == op_lesseq || opcodeID == op_greater || opcodeID == op_greatereq) {
-        enum class UInt32Result {
-            UInt32,
-            Constant,
-        };
-        auto isUInt32 = [&] (ExpressionNode* node) -> std::optional<UInt32Result> {
-            if (node->isBinaryOpNode() && static_cast<BinaryOpNode*>(node)->opcodeID() == op_urshift)
-                return UInt32Result::UInt32;
-            if (node->isNumber() && static_cast<NumberNode*>(node)->isIntegerNode()) {
-                int32_t value = static_cast<int32_t>(static_cast<IntegerNode*>(node)->value());
-                if (value >= 0)
-                    return UInt32Result::Constant;
-            }
-            return std::nullopt;
-        };
-        auto leftResult = isUInt32(m_expr1);
-        auto rightResult = isUInt32(m_expr2);
-        if ((leftResult && rightResult) && (leftResult.value() == UInt32Result::UInt32 || rightResult.value() == UInt32Result::UInt32)) {
-            auto* left = m_expr1;
-            auto* right = m_expr2;
-            if (left->isBinaryOpNode()) {
-                ASSERT(static_cast<BinaryOpNode*>(left)->opcodeID() == op_urshift);
-                static_cast<BinaryOpNode*>(left)->m_shouldToUnsignedResult = false;
-            }
-            if (right->isBinaryOpNode()) {
-                ASSERT(static_cast<BinaryOpNode*>(right)->opcodeID() == op_urshift);
-                static_cast<BinaryOpNode*>(right)->m_shouldToUnsignedResult = false;
-            }
-            RefPtr<RegisterID> src1 = generator.emitNodeForLeftHandSide(left, m_rightHasAssignments, right->isPure(generator));
-            RefPtr<RegisterID> src2 = generator.emitNode(right);
-            generator.emitExpressionInfo(position(), position(), position());
-
-            // Since the both sides only accept Int32, replacing operands is not observable to users.
-            bool replaceOperands = false;
-            OpcodeID resultOp = opcodeID;
-            switch (opcodeID) {
-            case op_less:
-                resultOp = op_below;
-                break;
-            case op_lesseq:
-                resultOp = op_beloweq;
-                break;
-            case op_greater:
-                resultOp = op_below;
-                replaceOperands = true;
-                break;
-            case op_greatereq:
-                resultOp = op_beloweq;
-                replaceOperands = true;
-                break;
-            default:
-                RELEASE_ASSERT_NOT_REACHED();
-            }
-            OperandTypes operandTypes(left->resultDescriptor(), right->resultDescriptor());
-            if (replaceOperands) {
-                std::swap(src1, src2);
-                operandTypes = OperandTypes(right->resultDescriptor(), left->resultDescriptor());
-            }
-            return generator.emitBinaryOp(resultOp, generator.finalDestination(dst, src1.get()), src1.get(), src2.get(), operandTypes);
-        }
-    }
-
     if (opcodeID == op_add && m_expr1->isAdd() && m_expr1->resultDescriptor().definitelyIsString()) {
         generator.emitExpressionInfo(position(), position(), position());
@@ -2079 +2017 @@
     }
     RegisterID* result = generator.emitBinaryOp(opcodeID, generator.finalDestination(dst, src1.get()), src1.get(), src2.get(), OperandTypes(left->resultDescriptor(), right->resultDescriptor()));
-    if (m_shouldToUnsignedResult) {
-        if (opcodeID == op_urshift && dst != generator.ignoredResult())
-            return generator.emitUnaryOp(op_unsigned, result, result);
-    }
+    if (opcodeID == op_urshift && dst != generator.ignoredResult())
+        return generator.emitUnaryOp(op_unsigned, result, result);
     return result;
 }