Revision: 10278
Author: [email protected]
Date: Mon Dec 19 04:50:44 2011
Log: Merge r10044 to 3.6 branch: Set maximum length of FixedArray in
terms of elements instead an absolute number of bytes.
BUG=103103
Review URL: http://codereview.chromium.org/8974010
http://code.google.com/p/v8/source/detail?r=10278
Modified:
/branches/3.6/src/objects.h
/branches/3.6/src/version.cc
=======================================
--- /branches/3.6/src/objects.h Thu Sep 15 00:25:40 2011
+++ /branches/3.6/src/objects.h Mon Dec 19 04:50:44 2011
@@ -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;
=======================================
--- /branches/3.6/src/version.cc Fri Dec 9 04:07:54 2011
+++ /branches/3.6/src/version.cc Mon Dec 19 04:50:44 2011
@@ -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
