From 17a82e72f490c8c384fec9563f58128ef3234034 Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Mon, 14 Nov 2011 17:17:23 -0800 Subject: [PATCH] Upgrade V8 to 3.6.6.8 --- deps/v8/src/runtime.cc | 7 ++++++- deps/v8/src/version.cc | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/deps/v8/src/runtime.cc b/deps/v8/src/runtime.cc index 6cb8d1a2f2d..813f98f684a 100644 --- a/deps/v8/src/runtime.cc +++ b/deps/v8/src/runtime.cc @@ -6841,7 +6841,12 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_SparseJoinWithSeparator) { // Find total length of join result. int string_length = 0; bool is_ascii = separator->IsAsciiRepresentation(); - int max_string_length = SeqAsciiString::kMaxLength; + int max_string_length; + if (is_ascii) { + max_string_length = SeqAsciiString::kMaxLength; + } else { + max_string_length = SeqTwoByteString::kMaxLength; + } bool overflow = false; CONVERT_NUMBER_CHECKED(int, elements_length, Int32, elements_array->length()); diff --git a/deps/v8/src/version.cc b/deps/v8/src/version.cc index 865cfe5007b..2865502c1f2 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 7 +#define PATCH_LEVEL 8 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0