Fix preparation for sorting of external arrays.
R=rossberg@chromium.org BUG=98773 TEST=mjsunit/regress/regress-98773 Review URL: http://codereview.chromium.org/8122020 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@9516 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
parent
abc8b0d183
commit
c034518442
@ -10698,8 +10698,6 @@ MaybeObject* JSObject::PrepareSlowElementsForSort(uint32_t limit) {
|
|||||||
// If the object is in dictionary mode, it is converted to fast elements
|
// If the object is in dictionary mode, it is converted to fast elements
|
||||||
// mode.
|
// mode.
|
||||||
MaybeObject* JSObject::PrepareElementsForSort(uint32_t limit) {
|
MaybeObject* JSObject::PrepareElementsForSort(uint32_t limit) {
|
||||||
ASSERT(!HasExternalArrayElements());
|
|
||||||
|
|
||||||
Heap* heap = GetHeap();
|
Heap* heap = GetHeap();
|
||||||
|
|
||||||
if (HasDictionaryElements()) {
|
if (HasDictionaryElements()) {
|
||||||
@ -10729,14 +10727,16 @@ MaybeObject* JSObject::PrepareElementsForSort(uint32_t limit) {
|
|||||||
|
|
||||||
set_map(new_map);
|
set_map(new_map);
|
||||||
set_elements(fast_elements);
|
set_elements(fast_elements);
|
||||||
|
} else if (HasExternalArrayElements()) {
|
||||||
|
// External arrays cannot have holes or undefined elements.
|
||||||
|
return Smi::FromInt(ExternalArray::cast(elements())->length());
|
||||||
} else if (!HasFastDoubleElements()) {
|
} else if (!HasFastDoubleElements()) {
|
||||||
Object* obj;
|
Object* obj;
|
||||||
{ MaybeObject* maybe_obj = EnsureWritableFastElements();
|
{ MaybeObject* maybe_obj = EnsureWritableFastElements();
|
||||||
if (!maybe_obj->ToObject(&obj)) return maybe_obj;
|
if (!maybe_obj->ToObject(&obj)) return maybe_obj;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ASSERT(HasFastTypeElements() ||
|
ASSERT(HasFastTypeElements() || HasFastDoubleElements());
|
||||||
HasFastDoubleElements());
|
|
||||||
|
|
||||||
// Collect holes at the end, undefined before that and the rest at the
|
// Collect holes at the end, undefined before that and the rest at the
|
||||||
// start, and return the number of non-hole, non-undefined values.
|
// start, and return the number of non-hole, non-undefined values.
|
||||||
|
39
test/mjsunit/regress/regress-98773.js
Normal file
39
test/mjsunit/regress/regress-98773.js
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
// Copyright 2011 the V8 project authors. All rights reserved.
|
||||||
|
// Redistribution and use in source and binary forms, with or without
|
||||||
|
// modification, are permitted provided that the following conditions are
|
||||||
|
// met:
|
||||||
|
//
|
||||||
|
// * Redistributions of source code must retain the above copyright
|
||||||
|
// notice, this list of conditions and the following disclaimer.
|
||||||
|
// * Redistributions in binary form must reproduce the above
|
||||||
|
// copyright notice, this list of conditions and the following
|
||||||
|
// disclaimer in the documentation and/or other materials provided
|
||||||
|
// with the distribution.
|
||||||
|
// * Neither the name of Google Inc. nor the names of its
|
||||||
|
// contributors may be used to endorse or promote products derived
|
||||||
|
// from this software without specific prior written permission.
|
||||||
|
//
|
||||||
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
|
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||||
|
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||||
|
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||||
|
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||||
|
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||||
|
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
|
// Calling Array.sort on an external array is not supposed to crash.
|
||||||
|
|
||||||
|
var array = new Int16Array(23);
|
||||||
|
array[7] = 7; array[9] = 9;
|
||||||
|
assertEquals(23, array.length);
|
||||||
|
assertEquals(7, array[7]);
|
||||||
|
assertEquals(9, array[9]);
|
||||||
|
|
||||||
|
Array.prototype.sort.call(array);
|
||||||
|
assertEquals(23, array.length);
|
||||||
|
assertEquals(7, array[21]);
|
||||||
|
assertEquals(9, array[22]);
|
Loading…
Reference in New Issue
Block a user