Merged r16977, r16979, r16983 into trunk branch.
Disable escape analysis for Canary stabilization.
Revert "Add methods to enable configuration of ResourceConstraints based on limits derived at runtime." and "Fix Windows build of defaults.cc."
Re-land "Add methods to enable configuration of ResourceConstraints based on limits derived at runtime."
BUG=292928
R=machenbach@chromium.org
Review URL: https://codereview.chromium.org/24996004
git-svn-id: http://v8.googlecode.com/svn/trunk@16985 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
diff --git a/src/defaults.cc b/src/defaults.cc
index 51159a8..301155f 100644
--- a/src/defaults.cc
+++ b/src/defaults.cc
@@ -45,15 +45,15 @@
// The young_space_size should be a power of 2 and old_generation_size should
// be a multiple of Page::kPageSize.
if (physical_memory > 2ul * i::GB) {
- constraints->set_max_young_space_size(8 * lump_of_memory);
+ constraints->set_max_young_space_size(16 * lump_of_memory);
constraints->set_max_old_space_size(700 * lump_of_memory);
constraints->set_max_executable_size(256 * lump_of_memory);
} else if (physical_memory > 512ul * i::MB) {
- constraints->set_max_young_space_size(4 * lump_of_memory);
+ constraints->set_max_young_space_size(8 * lump_of_memory);
constraints->set_max_old_space_size(192 * lump_of_memory);
constraints->set_max_executable_size(192 * lump_of_memory);
} else /* (physical_memory <= 512GB) */ {
- constraints->set_max_young_space_size(1 * lump_of_memory);
+ constraints->set_max_young_space_size(2 * lump_of_memory);
constraints->set_max_old_space_size(96 * lump_of_memory);
constraints->set_max_executable_size(96 * lump_of_memory);
}
diff --git a/src/flag-definitions.h b/src/flag-definitions.h
index 8a1d0e75..2a3c7e0 100644
--- a/src/flag-definitions.h
+++ b/src/flag-definitions.h
@@ -232,7 +232,7 @@
DEFINE_bool(use_gvn, true, "use hydrogen global value numbering")
DEFINE_bool(use_canonicalizing, true, "use hydrogen instruction canonicalizing")
DEFINE_bool(use_inlining, true, "use function inlining")
-DEFINE_bool(use_escape_analysis, true, "use hydrogen escape analysis")
+DEFINE_bool(use_escape_analysis, false, "use hydrogen escape analysis")
DEFINE_bool(use_allocation_folding, true, "use allocation folding")
DEFINE_int(max_inlining_levels, 5, "maximum number of inlining levels")
DEFINE_int(max_inlined_source_size, 600,
diff --git a/src/version.cc b/src/version.cc
index 462aef2..3be963e 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 22
#define BUILD_NUMBER 3
-#define PATCH_LEVEL 0
+#define PATCH_LEVEL 1
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
