Title: [183819] trunk/Source/_javascript_Core
- Revision
- 183819
- Author
- [email protected]
- Date
- 2015-05-05 10:59:33 -0700 (Tue, 05 May 2015)
Log Message
Fix debug builds after r183812
https://bugs.webkit.org/show_bug.cgi?id=144300
Rubber stamped by Andreas Kling and Filip Pizlo.
hasObjectMaterializationData() didn't treat MaterializeCreateActivation
as having materialization data, which was causing an assertion failure when
sinking CreateActivations on debug builds.
* dfg/DFGNode.h:
(JSC::DFG::Node::hasObjectMaterializationData):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (183818 => 183819)
--- trunk/Source/_javascript_Core/ChangeLog 2015-05-05 17:27:41 UTC (rev 183818)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-05-05 17:59:33 UTC (rev 183819)
@@ -1,3 +1,17 @@
+2015-05-05 Basile Clement <[email protected]>
+
+ Fix debug builds after r183812
+ https://bugs.webkit.org/show_bug.cgi?id=144300
+
+ Rubber stamped by Andreas Kling and Filip Pizlo.
+
+ hasObjectMaterializationData() didn't treat MaterializeCreateActivation
+ as having materialization data, which was causing an assertion failure when
+ sinking CreateActivations on debug builds.
+
+ * dfg/DFGNode.h:
+ (JSC::DFG::Node::hasObjectMaterializationData):
+
2015-05-04 Basile Clement <[email protected]>
Allow CreateActivation sinking
Modified: trunk/Source/_javascript_Core/dfg/DFGNode.h (183818 => 183819)
--- trunk/Source/_javascript_Core/dfg/DFGNode.h 2015-05-05 17:27:41 UTC (rev 183818)
+++ trunk/Source/_javascript_Core/dfg/DFGNode.h 2015-05-05 17:59:33 UTC (rev 183819)
@@ -1424,7 +1424,14 @@
bool hasObjectMaterializationData()
{
- return op() == MaterializeNewObject;
+ switch (op()) {
+ case MaterializeNewObject:
+ case MaterializeCreateActivation:
+ return true;
+
+ default:
+ return false;
+ }
}
ObjectMaterializationData& objectMaterializationData()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
