Changeset 180237 in webkit for trunk/Source/JavaScriptCore/dfg/DFGStackLayoutPhase.cpp

Timestamp:

Feb 17, 2015, 1:41:25 PM (10 years ago)

Author:

[email protected]

Message:

StackLayoutPhase should use CodeBlock::usesArguments rather than FunctionExecutable::usesArguments
​https://bugs.webkit.org/show_bug.cgi?id=141721
rdar://problem/17198633

Reviewed by Michael Saboff.

I've seen cases where the two are out of sync. We know we can trust the CodeBlock::usesArguments because
we use it everywhere else.

No test because I could never reproduce the crash.

• dfg/DFGGraph.h:

(JSC::DFG::Graph::usesArguments):

• dfg/DFGStackLayoutPhase.cpp:

(JSC::DFG::StackLayoutPhase::run):

File:

• trunk/Source/JavaScriptCore/dfg/DFGStackLayoutPhase.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/dfg/DFGStackLayoutPhase.cpp

@@ -107 +107 @@
         for (InlineCallFrameSet::iterator iter = m_graph.m_plan.inlineCallFrames->begin(); !!iter; ++iter) {
             InlineCallFrame* inlineCallFrame = *iter;
-            if (!inlineCallFrame->executable->usesArguments())
+            if (!m_graph.usesArguments(inlineCallFrame))
                 continue;
             
@@ -176 +176 @@
             InlineCallFrame* inlineCallFrame = data.inlineCallFrame;
             
-            if (inlineCallFrame->executable->usesArguments()) {
+            if (m_graph.usesArguments(inlineCallFrame)) {
                 inlineCallFrame->argumentsRegister = virtualRegisterForLocal(
                     allocation[m_graph.argumentsRegisterFor(inlineCallFrame).toLocal()]);