Reviewers: Jakob,

Description:
Version 3.26.31.15 (merged r22494)

Fix off-by-one error in Array.concat slow mode check

BUG=chromium:395499
LOG=N
[email protected]

Please review this at https://codereview.chromium.org/439723005/

SVN Base: https://v8.googlecode.com/svn/branches/3.26

Affected files (+3, -3 lines):
  M src/runtime.cc
  M src/version.cc


Index: src/runtime.cc
diff --git a/src/runtime.cc b/src/runtime.cc
index a7a4ace0e43edee9a9484fc5167e0ce8cf3c04ff..8c1e4312868aabd9f95d61d470ebe824a5b4b714 100644
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -10051,8 +10051,8 @@ class ArrayConcatVisitor {
     // but the array blowing the limit didn't contain elements beyond the
     // provided-for index range, go to dictionary mode now.
     if (fast_elements_ &&
-        index_offset_ >= static_cast<uint32_t>(
-            FixedArrayBase::cast(*storage_)->length())) {
+        index_offset_ >
+ static_cast<uint32_t>(FixedArrayBase::cast(*storage_)->length())) {
       SetDictionaryMode();
     }
   }
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index 23a43e8aec166f0f98d9eaccebd28989f805b7d0..ce1cf2ebe760e2537c0e6874c37804045cfc38a1 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     3
 #define MINOR_VERSION     26
 #define BUILD_NUMBER      31
-#define PATCH_LEVEL       14
+#define PATCH_LEVEL       15
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
 #define IS_CANDIDATE_VERSION 0


--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to