Changeset 209764 in webkit for trunk/Source/JavaScriptCore/dfg/DFGOSREntrypointCreationPhase.cpp

Timestamp:

Dec 13, 2016, 11:38:13 AM (9 years ago)

Author:

[email protected]

Message:

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

"Broke ARMv7 builds" (Requested by msaboff on #webkit).

Reverted changeset:

"REGRESSION(r209653): speedometer crashes making virtual slow
path tailcalls"
​https://bugs.webkit.org/show_bug.cgi?id=165748
​http://trac.webkit.org/changeset/209725

File:

• trunk/Source/JavaScriptCore/dfg/DFGOSREntrypointCreationPhase.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/dfg/DFGOSREntrypointCreationPhase.cpp

@@ -113 +113 @@
         origin = target->at(0)->origin;
         
-        for (unsigned argument = 0; argument < static_cast<unsigned>(baseline->numParameters()); ++argument) {
+        for (int argument = 0; argument < baseline->numParameters(); ++argument) {
             Node* oldNode = target->variablesAtHead.argument(argument);
             if (!oldNode) {
-                // Just for sanity, always have an argument node even if it's not needed.
-                oldNode = m_graph.m_argumentsForChecking[argument];
+                // Just for sanity, always have a SetArgument even if it's not needed.
+                oldNode = m_graph.m_arguments[argument];
             }
-            Node* node;
-            Node* stackNode;
-            if (argument < NUMBER_OF_JS_FUNCTION_ARGUMENT_REGISTERS) {
-                node = newRoot->appendNode(
-                    m_graph, SpecNone, GetArgumentRegister, origin,
-                    OpInfo(oldNode->variableAccessData()),
-                    OpInfo(argumentRegisterIndexForJSFunctionArgument(argument)));
-                stackNode = newRoot->appendNode(
-                    m_graph, SpecNone, SetLocal, origin,
-                    OpInfo(oldNode->variableAccessData()),
-                    Edge(node));
-            } else {
-                node = newRoot->appendNode(
-                    m_graph, SpecNone, SetArgument, origin,
-                    OpInfo(oldNode->variableAccessData()));
-                stackNode = node;
-            }
-
-            m_graph.m_argumentsForChecking[argument] = node;
-            m_graph.m_argumentsOnStack[argument] = stackNode;
+            Node* node = newRoot->appendNode(
+                m_graph, SpecNone, SetArgument, origin,
+                OpInfo(oldNode->variableAccessData()));
+            m_graph.m_arguments[argument] = node;
         }