Bug 931077 - fix awfy workload0 asm.js perf regression on 32-bit (r=sfink)
authorLuke Wagner <luke@mozilla.com>
Fri, 25 Oct 2013 11:58:05 -0500
changeset 166082 74bd63cbb48086f3f3b79744aa54b2eec51a0e57
parent 166081 b569edfd98c25fda87d00cf53143cf4b7ad6b9c2
child 166083 f7dcf8411463884295269ab7fe2369d8f782133a
push id3066
push userakeybl@mozilla.com
push dateMon, 09 Dec 2013 19:58:46 +0000
treeherdermozilla-beta@a31a0dce83aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssfink
bugs931077
milestone27.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 931077 - fix awfy workload0 asm.js perf regression on 32-bit (r=sfink)
js/src/vm/TypedArrayObject.cpp
--- a/js/src/vm/TypedArrayObject.cpp
+++ b/js/src/vm/TypedArrayObject.cpp
@@ -533,17 +533,17 @@ ArrayBufferObject::releaseAsmJSArrayBuff
 }
 #else  /* defined(JS_ION) && defined(JS_CPU_X64) */
 bool
 ArrayBufferObject::prepareForAsmJS(JSContext *cx, Handle<ArrayBufferObject*> buffer)
 {
     if (buffer->isAsmJSArrayBuffer())
         return true;
 
-    if (!buffer->copyData(cx))
+    if (!buffer->ensureNonInline(cx))
         return false;
     JS_ASSERT(buffer->hasDynamicElements());
 
     buffer->getElementsHeader()->setIsAsmJSArrayBuffer();
     return true;
 }
 
 void