[webkit-changes] [181867] trunk/Source/JavaScriptCore

[joepeck]

Title: [181867] trunk/Source/_javascript_Core

Revision

181867

Author

joep...@webkit.org

Date

2015-03-23 13:48:18 -0700 (Mon, 23 Mar 2015)

Log Message

Fix DO_PROPERTYMAP_CONSTENCY_CHECK enabled build
https://bugs.webkit.org/show_bug.cgi?id=142952

Reviewed by Geoffrey Garen.

* runtime/Structure.cpp:
(JSC::PropertyTable::checkConsistency):
The check offset method doesn't exist in PropertyTable, it exists in Structure.

(JSC::Structure::checkConsistency):
So move it here, and always put it at the start to match normal behavior.

Modified Paths

• trunk/Source/_javascript_Core/ChangeLog
• trunk/Source/_javascript_Core/runtime/Structure.cpp

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (181866 => 181867)

--- trunk/Source/_javascript_Core/ChangeLog	2015-03-23 20:42:03 UTC (rev 181866)
+++ trunk/Source/_javascript_Core/ChangeLog	2015-03-23 20:48:18 UTC (rev 181867)
@@ -1,3 +1,17 @@
+2015-03-23  Joseph Pecoraro  <pecor...@apple.com>
+
+        Fix DO_PROPERTYMAP_CONSTENCY_CHECK enabled build
+        https://bugs.webkit.org/show_bug.cgi?id=142952
+
+        Reviewed by Geoffrey Garen.
+
+        * runtime/Structure.cpp:
+        (JSC::PropertyTable::checkConsistency):
+        The check offset method doesn't exist in PropertyTable, it exists in Structure.
+
+        (JSC::Structure::checkConsistency):
+        So move it here, and always put it at the start to match normal behavior.
+
 2015-03-22  Filip Pizlo  <fpi...@apple.com>
 
         Remove DFG::ValueRecoveryOverride; it's been dead since we removed forward speculations

Modified: trunk/Source/_javascript_Core/runtime/Structure.cpp (181866 => 181867)

--- trunk/Source/_javascript_Core/runtime/Structure.cpp	2015-03-23 20:42:03 UTC (rev 181866)
+++ trunk/Source/_javascript_Core/runtime/Structure.cpp	2015-03-23 20:48:18 UTC (rev 181867)
@@ -828,15 +828,6 @@
 
 #endif
 
-#if !DO_PROPERTYMAP_CONSTENCY_CHECK
-
-inline void Structure::checkConsistency()
-{
-    checkOffsetConsistency();
-}
-
-#endif
-
 PropertyTable* Structure::copyPropertyTable(VM& vm)
 {
     if (!propertyTable())
@@ -1133,7 +1124,6 @@
 
 void PropertyTable::checkConsistency()
 {
-    checkOffsetConsistency();
     ASSERT(m_indexSize >= PropertyTable::MinimumTableSize);
     ASSERT(m_indexMask);
     ASSERT(m_indexSize == m_indexMask + 1);
@@ -1191,6 +1181,8 @@
 
 void Structure::checkConsistency()
 {
+    checkOffsetConsistency();
+
     if (!propertyTable())
         return;
 
@@ -1204,6 +1196,13 @@
     propertyTable()->checkConsistency();
 }
 
+#else
+
+inline void Structure::checkConsistency()
+{
+    checkOffsetConsistency();
+}
+
 #endif // DO_PROPERTYMAP_CONSTENCY_CHECK
 
 bool ClassInfo::hasStaticSetterOrReadonlyProperties() const

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes