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

Timestamp:

Jan 29, 2014, 11:18:54 AM (12 years ago)

Author:

[email protected]

Message:

Merge the jsCStack branch
​https://bugs.webkit.org/show_bug.cgi?id=127763

Reviewed by Mark Hahnenberg.

Source/JavaScriptCore:

Changes from ​http://svn.webkit.org/repository/webkit/branches/jsCStack
up to changeset 162958.

Source/WebCore:

Changes from ​http://svn.webkit.org/repository/webkit/branches/jsCStack
up to changeset 162958.

Source/WTF:

Changes from ​http://svn.webkit.org/repository/webkit/branches/jsCStack
up to changeset 162958.

File:

• trunk/Source/JavaScriptCore/dfg/DFGOSREntrypointCreationPhase.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/dfg/DFGOSREntrypointCreationPhase.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -64 +64 @@
             if (!block)
                 continue;
+            unsigned nodeIndex = 0;
             Node* firstNode = block->at(0);
+            while (firstNode->isSemanticallySkippable())
+                firstNode = block->at(++nodeIndex);
             if (firstNode->op() == LoopHint
                 && firstNode->codeOrigin == CodeOrigin(bytecodeIndex)) {
@@ -84 +87 @@
         CodeOrigin codeOrigin = target->at(0)->codeOrigin;
         
-        for (int argument = 0; argument < baseline->numParameters(); ++argument) {
-            Node* oldNode = target->variablesAtHead.argument(argument);
-            if (!oldNode) {
-                // Just for sanity, always have a SetArgument even if it's not needed.
-                oldNode = m_graph.m_arguments[argument];
-            }
-            Node* node = newRoot->appendNode(
-                m_graph, SpecNone, SetArgument, codeOrigin,
-                OpInfo(oldNode->variableAccessData()));
-            m_graph.m_arguments[argument] = node;
-        }
         Vector<Node*> locals(baseline->m_numCalleeRegisters);
         for (int local = 0; local < baseline->m_numCalleeRegisters; ++local) {
@@ -109 +101 @@
                 Edge(locals[local]));
         }
+
+        for (int argument = 0; argument < baseline->numParameters(); ++argument) {
+            Node* oldNode = target->variablesAtHead.argument(argument);
+            if (!oldNode) {
+                // Just for sanity, always have a SetArgument even if it's not needed.
+                oldNode = m_graph.m_arguments[argument];
+            }
+            Node* node = newRoot->appendNode(
+                m_graph, SpecNone, SetArgument, codeOrigin,
+                OpInfo(oldNode->variableAccessData()));
+            m_graph.m_arguments[argument] = node;
+        }
+        
         for (int local = 0; local < baseline->m_numCalleeRegisters; ++local) {
             Node* previousHead = target->variablesAtHead.local(local);