Unreviewed build fix
authormmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 12 Oct 2015 23:26:36 +0000 (23:26 +0000)
committermmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 12 Oct 2015 23:26:36 +0000 (23:26 +0000)
* runtime/JSObject.cpp:
(JSC::JSObject::reallocateAndShrinkButterfly):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@190904 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/runtime/JSObject.cpp

index 907f8d1..fe90cc7 100644 (file)
@@ -1,3 +1,10 @@
+2015-10-12  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Unreviewed build fix
+
+        * runtime/JSObject.cpp:
+        (JSC::JSObject::reallocateAndShrinkButterfly):
+
 2015-10-08  Filip Pizlo  <fpizlo@apple.com>
 
         GC should have a Baker barrier for concurrent copying
index de5df9e..f8ff316 100644 (file)
@@ -2494,8 +2494,8 @@ void JSObject::reallocateAndShrinkButterfly(VM& vm, unsigned length)
     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));