Revision: 6947 Author: [email protected] Date: Fri Feb 25 03:44:19 2011 Log: Port fix of issue 73940 (revision 6946) to 3.0 branch.
Review URL: http://codereview.chromium.org/6588005 http://code.google.com/p/v8/source/detail?r=6947 Modified: /branches/3.0/src/array.js /branches/3.0/src/version.cc ======================================= --- /branches/3.0/src/array.js Tue Feb 1 04:52:48 2011 +++ /branches/3.0/src/array.js Fri Feb 25 03:44:19 2011 @@ -1023,13 +1023,13 @@ } var min = index; var max = length; - if (UseSparseVariant(this, length, true)) { + if (UseSparseVariant(this, length, IS_ARRAY(this))) { var intervals = %GetArrayKeys(this, length); if (intervals.length == 2 && intervals[0] < 0) { // A single interval. var intervalMin = -(intervals[0] + 1); var intervalMax = intervalMin + intervals[1]; - min = MAX(min, intervalMin); + if (min < intervalMin) min = intervalMin; max = intervalMax; // Capped by length already. // Fall through to loop below. } else { @@ -1079,13 +1079,13 @@ } var min = 0; var max = index; - if (UseSparseVariant(this, length, true)) { + if (UseSparseVariant(this, length, IS_ARRAY(this))) { var intervals = %GetArrayKeys(this, index + 1); if (intervals.length == 2 && intervals[0] < 0) { // A single interval. var intervalMin = -(intervals[0] + 1); var intervalMax = intervalMin + intervals[1]; - min = MAX(min, intervalMin); + if (min < intervalMin) min = intervalMin; max = intervalMax; // Capped by index already. // Fall through to loop below. } else { ======================================= --- /branches/3.0/src/version.cc Wed Feb 23 22:54:53 2011 +++ /branches/3.0/src/version.cc Fri Feb 25 03:44:19 2011 @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 0 #define BUILD_NUMBER 12 -#define PATCH_LEVEL 24 +#define PATCH_LEVEL 25 #define CANDIDATE_VERSION false // Define SONAME to have the SCons build the put a specific SONAME into the -- v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev
