Reviewers: Michael Starzinger,

Description:
Merged r16324 into 3.20 branch.

Lower kInitialMaxFastElementArray constant to 95K

BUG=v8:2790
[email protected]

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

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

Affected files:
  M src/objects.h
  M src/version.cc
  A + test/mjsunit/regress/regress-2790.js


Index: src/objects.h
diff --git a/src/objects.h b/src/objects.h
index 3430431e643dc65a7f427c701be84ed5c8705591..c72d150f2ea2b2104e1507f9ee8be876eae94f0d 100644
--- a/src/objects.h
+++ b/src/objects.h
@@ -2719,7 +2719,11 @@ class JSObject: public JSReceiver {
   // don't want to be wasteful with long lived objects.
   static const int kMaxUncheckedOldFastElementsLength = 500;

-  static const int kInitialMaxFastElementArray = 100000;
+  // TODO(2790): HAllocate currently always allocates fast backing stores
+  // in new space, where on x64 we can only fit ~98K elements. Keep this
+  // limit lower than that until HAllocate is made smarter.
+  static const int kInitialMaxFastElementArray = 95000;
+
   static const int kFastPropertiesSoftLimit = 12;
   static const int kMaxFastProperties = 64;
   static const int kMaxInstanceSize = 255 * kPointerSize;
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index e78f96947752f95b8341b68a8241898518892ff6..4b43d3bfc82a743b21dfda6f266b7e5f2a242c9a 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     3
 #define MINOR_VERSION     20
 #define BUILD_NUMBER      17
-#define PATCH_LEVEL       4
+#define PATCH_LEVEL       5
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
 #define IS_CANDIDATE_VERSION 0
Index: test/mjsunit/regress/regress-2790.js
diff --git a/test/mjsunit/regress/regress-crbug-172345.js b/test/mjsunit/regress/regress-2790.js
similarity index 93%
copy from test/mjsunit/regress/regress-crbug-172345.js
copy to test/mjsunit/regress/regress-2790.js
index 711501caa791f2974635ac4dd894568a2e3fc982..86305b8867a1b96c65a1731c98bc9a331d9197aa 100644
--- a/test/mjsunit/regress/regress-crbug-172345.js
+++ b/test/mjsunit/regress/regress-2790.js
@@ -25,10 +25,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-function f(a,i) {
-  return a[i];
+// Test that we can create arrays of any size.
+for (var i = 1000; i < 1000000; i += 97) {
+  new Array(i);
 }
-
-f([1,2,3], "length");
-f([1,2,3], "length");
-f([1,2,3], 2);


--
--
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/groups/opt_out.

Reply via email to