Check for read-only-ness when preparing for array sort.
R=verwaest@chromium.org BUG=v8:2419 Review URL: https://chromiumcodereview.appspot.com/11759022 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@13313 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
parent
8a2cca5207
commit
4ee20d857b
@ -11896,8 +11896,9 @@ MaybeObject* JSObject::PrepareSlowElementsForSort(uint32_t limit) {
|
||||
ASSERT(!k->IsHeapNumber() || HeapNumber::cast(k)->value() <= kMaxUInt32);
|
||||
Object* value = dict->ValueAt(i);
|
||||
PropertyDetails details = dict->DetailsAt(i);
|
||||
if (details.type() == CALLBACKS) {
|
||||
if (details.type() == CALLBACKS || details.IsReadOnly()) {
|
||||
// Bail out and do the sorting of undefineds and array holes in JS.
|
||||
// Also bail out if the element is not supposed to be moved.
|
||||
return Smi::FromInt(-1);
|
||||
}
|
||||
uint32_t key = NumberToUint32(k);
|
||||
|
37
test/mjsunit/regress/regress-2419.js
Normal file
37
test/mjsunit/regress/regress-2419.js
Normal file
@ -0,0 +1,37 @@
|
||||
// Copyright 2012 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.
|
||||
|
||||
var a = [5, 4, 3, 2, 1, 0];
|
||||
Object.freeze(a);
|
||||
a.sort();
|
||||
assertArrayEquals([5, 4, 3, 2, 1, 0], a);
|
||||
|
||||
var b = {0: 5, 1: 4, 2: 3, 3: 2, 4: 1, 5: 0, length: 6};
|
||||
Object.freeze(b);
|
||||
Array.prototype.sort.call(b);
|
||||
assertPropertiesEqual({0: 5, 1: 4, 2: 3, 3: 2, 4: 1, 5: 0, length: 6}, b);
|
||||
|
Loading…
Reference in New Issue
Block a user