Reviewers: Rico, Description: Merge r10044 to 3.6 branch: Set maximum length of FixedArray in terms of elements instead an absolute number of bytes.
BUG=103103 Please review this at http://codereview.chromium.org/8974010/ SVN Base: http://v8.googlecode.com/svn/branches/3.6/ Affected files: M src/objects.h M src/version.cc Index: src/objects.h =================================================================== --- src/objects.h (revision 10276) +++ src/objects.h (working copy) @@ -2172,7 +2172,7 @@ // Maximal allowed size, in bytes, of a single FixedArray. // Prevents overflowing size computations, as well as extreme memory // consumption. - static const int kMaxSize = 512 * MB; + static const int kMaxSize = 128 * MB * kPointerSize; // Maximally allowed length of a FixedArray. static const int kMaxLength = (kMaxSize - kHeaderSize) / kPointerSize; Index: src/version.cc =================================================================== --- src/version.cc (revision 10276) +++ src/version.cc (working copy) @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 6 #define BUILD_NUMBER 6 -#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
