diff --git a/deps/v8/src/array.js b/deps/v8/src/array.js index 4dd23c8bb4..98fe3ac7b1 100644 --- a/deps/v8/src/array.js +++ b/deps/v8/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); diff --git a/deps/v8/src/runtime.cc b/deps/v8/src/runtime.cc index 3ea93049c0..6cb8d1a2f2 100644 --- a/deps/v8/src/runtime.cc +++ b/deps/v8/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, diff --git a/deps/v8/src/version.cc b/deps/v8/src/version.cc index da7c363a6c..865cfe5007 100644 --- a/deps/v8/src/version.cc +++ b/deps/v8/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 diff --git a/deps/v8/test/mjsunit/regress/regress-103259.js b/deps/v8/test/mjsunit/regress/regress-103259.js new file mode 100644 index 0000000000..447073caf7 --- /dev/null +++ b/deps/v8/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));