Reviewers: Jakob,
Message:
PTAL.
Description:
Merge r9917 into 3.6 branch. This fixes issue 103259.
BUG=103259
TEST=test/mjsunit/regress/regress-103259.js
Please review this at http://codereview.chromium.org/8495017/
SVN Base: https://v8.googlecode.com/svn/branches/3.6
Affected files:
M src/array.js
M src/runtime.cc
M src/version.cc
A test/mjsunit/regress/regress-103259.js
Index: src/array.js
diff --git a/src/array.js b/src/array.js
index
4dd23c8bb464b31b4171e7e671b9a8bb106f1951..98fe3ac7b14e5b4861cf11d4581ed2a9e67ff367
100644
--- a/src/array.js
+++ b/src/array.js
@@ -172,12 +172,12 @@ function Join(array, length, separator, convert) {
} else {
for (var i = 0; i < length; i++) {
var e = array[i];
- if (IS_NUMBER(e)) {
- e = %_NumberToString(e);
- } else if (!IS_STRING(e)) {
- e = convert(e);
- }
- elements[i] = e;
+ if (IS_NUMBER(e)) {
+ e = %_NumberToString(e);
+ } else if (!IS_STRING(e)) {
+ e = convert(e);
+ }
+ elements[i] = e;
}
}
var result = %_FastAsciiArrayJoin(elements, separator);
Index: src/runtime.cc
diff --git a/src/runtime.cc b/src/runtime.cc
index
3ea93049c01d63cf4357430ed3ed39db7f4f1ded..6cb8d1a2f2d5b4741f47b5fa0fbd0f54698ef5a4
100644
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -6840,7 +6840,7 @@ RUNTIME_FUNCTION(MaybeObject*,
Runtime_SparseJoinWithSeparator) {
// Find total length of join result.
int string_length = 0;
- bool is_ascii = true;
+ bool is_ascii = separator->IsAsciiRepresentation();
int max_string_length = SeqAsciiString::kMaxLength;
bool overflow = false;
CONVERT_NUMBER_CHECKED(int, elements_length,
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
da7c363a6cc89fcb76cb51db5288d984728f3f97..865cfe5007b3ce99c8d7a30abf65e14917fd5700
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 6
#define BUILD_NUMBER 6
-#define PATCH_LEVEL 6
+#define PATCH_LEVEL 7
// 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-103259.js
diff --git a/test/mjsunit/regress/regress-103259.js
b/test/mjsunit/regress/regress-103259.js
new file mode 100644
index
0000000000000000000000000000000000000000..447073caf780eeed10a4acd4a36fc22c484d44eb
--- /dev/null
+++ b/test/mjsunit/regress/regress-103259.js
@@ -0,0 +1,36 @@
+// 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.
+
+// Flags: --allow-natives-syntax
+
+var a = [];
+a[8192] = '';
+assertTrue(%HasDictionaryElements(a));
+var uc16 = '\u0094';
+var test = uc16;
+for (var i = 0; i < 13; i++) test += test;
+assertEquals(test, a.join(uc16));
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
