Reviewers: rossberg,
Description:
Merge r9516 into 3.5 branch.
Fix preparation for sorting of external arrays.
[email protected]
BUG=98773
TEST=mjsunit/regress/regress-98773
Please review this at http://codereview.chromium.org/8141001/
SVN Base: http://v8.googlecode.com/svn/branches/3.5/
Affected files:
M src/objects.cc
M src/version.cc
A + test/mjsunit/regress/regress-98773.js
### BEGIN SVN COPY METADATA
#$ cp branches/bleeding_edge/test/mjsunit/regress/regress-98773.js
test/mjsunit/regress/regress-98773.js
### END SVN COPY METADATA
Index: src/objects.cc
===================================================================
--- src/objects.cc (revision 9515)
+++ src/objects.cc (working copy)
@@ -10151,8 +10151,6 @@
// If the object is in dictionary mode, it is converted to fast elements
// mode.
MaybeObject* JSObject::PrepareElementsForSort(uint32_t limit) {
- ASSERT(!HasExternalArrayElements());
-
Heap* heap = GetHeap();
if (HasDictionaryElements()) {
@@ -10182,6 +10180,9 @@
set_map(new_map);
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()) {
Object* obj;
{ MaybeObject* maybe_obj = EnsureWritableFastElements();
Index: src/version.cc
===================================================================
--- src/version.cc (revision 9515)
+++ src/version.cc (working copy)
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 5
#define BUILD_NUMBER 10
-#define PATCH_LEVEL 15
+#define PATCH_LEVEL 16
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
Index: test/mjsunit/regress/regress-98773.js
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
