Title: [118327] trunk/Source/_javascript_Core
- Revision
- 118327
- Author
- [email protected]
- Date
- 2012-05-23 23:58:52 -0700 (Wed, 23 May 2012)
Log Message
Unreviewed, merge the arguments fix in r118138 to get bots green.
* dfg/DFGArgumentsSimplificationPhase.cpp:
(JSC::DFG::ArgumentsSimplificationPhase::observeBadArgumentsUse):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (118326 => 118327)
--- trunk/Source/_javascript_Core/ChangeLog 2012-05-24 06:55:28 UTC (rev 118326)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-05-24 06:58:52 UTC (rev 118327)
@@ -1,3 +1,10 @@
+2012-05-23 Filip Pizlo <[email protected]>
+
+ Unreviewed, merge the arguments fix in r118138 to get bots green.
+
+ * dfg/DFGArgumentsSimplificationPhase.cpp:
+ (JSC::DFG::ArgumentsSimplificationPhase::observeBadArgumentsUse):
+
2012-05-20 Filip Pizlo <[email protected]>
DFG CFA should record if a node can OSR exit
Modified: trunk/Source/_javascript_Core/dfg/DFGArgumentsSimplificationPhase.cpp (118326 => 118327)
--- trunk/Source/_javascript_Core/dfg/DFGArgumentsSimplificationPhase.cpp 2012-05-24 06:55:28 UTC (rev 118326)
+++ trunk/Source/_javascript_Core/dfg/DFGArgumentsSimplificationPhase.cpp 2012-05-24 06:58:52 UTC (rev 118327)
@@ -603,20 +603,30 @@
return;
Node& child = m_graph[edge];
- if (child.op() != GetLocal)
- return;
-
- if (child.local() == m_graph.uncheckedArgumentsRegisterFor(child.codeOrigin)) {
+ switch (child.op()) {
+ case CreateArguments: {
m_createsArguments.add(child.codeOrigin.inlineCallFrame);
- return;
+ break;
}
-
- VariableAccessData* variableAccessData = child.variableAccessData();
- if (variableAccessData->isCaptured())
- return;
-
- ArgumentsAliasingData& data = ""
- data.escapes = true;
+
+ case GetLocal: {
+ if (child.local() == m_graph.uncheckedArgumentsRegisterFor(child.codeOrigin)) {
+ m_createsArguments.add(child.codeOrigin.inlineCallFrame);
+ break;
+ }
+
+ VariableAccessData* variableAccessData = child.variableAccessData();
+ if (variableAccessData->isCaptured())
+ break;
+
+ ArgumentsAliasingData& data = ""
+ data.escapes = true;
+ break;
+ }
+
+ default:
+ break;
+ }
}
void observeBadArgumentsUses(Node& node)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
