Unreviewed debug build fix after r186358.
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 6 Jul 2015 18:14:18 +0000 (18:14 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 6 Jul 2015 18:14:18 +0000 (18:14 +0000)
* runtime/JSArray.cpp:
(JSC::JSArray::fastConcatWith):
Pass vm parameter to fastConcatType.

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

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/runtime/JSArray.cpp

index e57434c..230120b 100644 (file)
@@ -1,3 +1,11 @@
+2015-07-06  Alex Christensen  <achristensen@webkit.org>
+
+        Unreviewed debug build fix after r186358.
+
+        * runtime/JSArray.cpp:
+        (JSC::JSArray::fastConcatWith):
+        Pass vm parameter to fastConcatType.
+
 2015-07-06  Ryosuke Niwa  <rniwa@webkit.org>
 
         Array.concat should be fast for integer or double arrays
index db4fb29..2c5a19a 100644 (file)
@@ -710,9 +710,10 @@ JSArray* JSArray::fastSlice(ExecState& exec, unsigned startIndex, unsigned count
 EncodedJSValue JSArray::fastConcatWith(ExecState& exec, JSArray& otherArray)
 {
     auto newArrayType = indexingType();
-    ASSERT(newArrayType == fastConcatType(*this, otherArray));
 
     VM& vm = exec.vm();
+    ASSERT(newArrayType == fastConcatType(vm, *this, otherArray));
+
     unsigned thisArraySize = m_butterfly->publicLength();
     unsigned otherArraySize = otherArray.m_butterfly->publicLength();
     ASSERT(thisArraySize + otherArraySize < MIN_SPARSE_ARRAY_INDEX);