Title: [190904] trunk/Source/_javascript_Core
- Revision
- 190904
- Author
- mmaxfi...@apple.com
- Date
- 2015-10-12 16:26:36 -0700 (Mon, 12 Oct 2015)
Log Message
Unreviewed build fix
* runtime/JSObject.cpp:
(JSC::JSObject::reallocateAndShrinkButterfly):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (190903 => 190904)
--- trunk/Source/_javascript_Core/ChangeLog 2015-10-12 23:25:41 UTC (rev 190903)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-10-12 23:26:36 UTC (rev 190904)
@@ -1,3 +1,10 @@
+2015-10-12 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Unreviewed build fix
+
+ * runtime/JSObject.cpp:
+ (JSC::JSObject::reallocateAndShrinkButterfly):
+
2015-10-08 Filip Pizlo <fpi...@apple.com>
GC should have a Baker barrier for concurrent copying
Modified: trunk/Source/_javascript_Core/runtime/JSObject.cpp (190903 => 190904)
--- trunk/Source/_javascript_Core/runtime/JSObject.cpp 2015-10-12 23:25:41 UTC (rev 190903)
+++ trunk/Source/_javascript_Core/runtime/JSObject.cpp 2015-10-12 23:26:36 UTC (rev 190904)
@@ -2494,8 +2494,8 @@
ASSERT(length < MAX_ARRAY_INDEX);
ASSERT(length < MAX_STORAGE_VECTOR_LENGTH);
ASSERT(hasContiguous(indexingType()) || hasInt32(indexingType()) || hasDouble(indexingType()) || hasUndecided(indexingType()));
- ASSERT(m_butterfly->vectorLength() > length);
- ASSERT(!m_butterfly->indexingHeader()->preCapacity(structure()));
+ ASSERT(m_butterfly.get(this)->vectorLength() > length);
+ ASSERT(!m_butterfly.get(this)->indexingHeader()->preCapacity(structure()));
DeferGC deferGC(vm.heap);
Butterfly* newButterfly = m_butterfly.get(this)->resizeArray(vm, this, structure(), 0, ArrayStorage::sizeFor(length));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes