Title: [158148] branches/safari-537.73-branch/Source/_javascript_Core
- Revision
- 158148
- Author
- [email protected]
- Date
- 2013-10-28 18:15:38 -0700 (Mon, 28 Oct 2013)
Log Message
Debug build correction after r158124.
* runtime/JSObject.h:
(JSC::JSObject::setStructure): Use external hasIndexingHeader function since
the member function did not exist at the time of this branch.
Modified Paths
Diff
Modified: branches/safari-537.73-branch/Source/_javascript_Core/ChangeLog (158147 => 158148)
--- branches/safari-537.73-branch/Source/_javascript_Core/ChangeLog 2013-10-29 00:56:17 UTC (rev 158147)
+++ branches/safari-537.73-branch/Source/_javascript_Core/ChangeLog 2013-10-29 01:15:38 UTC (rev 158148)
@@ -1,3 +1,11 @@
+2013-10-28 Brent Fulgham <[email protected]>
+
+ Debug build correction after r158124.
+
+ * runtime/JSObject.h:
+ (JSC::JSObject::setStructure): Use external hasIndexingHeader function since
+ the member function did not exist at the time of this branch.
+
2013-10-28 Lucas Forschler <[email protected]>
Merge r156302
Modified: branches/safari-537.73-branch/Source/_javascript_Core/runtime/JSObject.h (158147 => 158148)
--- branches/safari-537.73-branch/Source/_javascript_Core/runtime/JSObject.h 2013-10-29 00:56:17 UTC (rev 158147)
+++ branches/safari-537.73-branch/Source/_javascript_Core/runtime/JSObject.h 2013-10-29 01:15:38 UTC (rev 158148)
@@ -1348,7 +1348,7 @@
inline void JSObject::setStructure(VM& vm, Structure* structure, Butterfly* butterfly)
{
JSCell::setStructure(vm, structure);
- ASSERT_UNUSED(butterfly, !butterfly == !(structure->outOfLineCapacity() || structure->hasIndexingHeader(this)));
+ ASSERT_UNUSED(butterfly, !butterfly == !(structure->outOfLineCapacity() || hasIndexingHeader(structure->indexingType())));
}
inline void JSObject::setStructureAndReallocateStorageIfNecessary(VM& vm, unsigned oldCapacity, Structure* newStructure)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
