diff options
| author | Jochen Eisinger <jochen@chromium.org> | 2015-01-12 09:27:34 +0100 |
|---|---|---|
| committer | Jochen Eisinger <jochen@chromium.org> | 2015-01-12 08:27:47 +0000 |
| commit | 1bf660fafd6c66fe862d5eef0b06e53e9967621b (patch) | |
| tree | 641e4a7d515525367ecfc8622de3bada1223680b | |
| parent | 87d803140135c8161ef65222281de1a0bfabf606 (diff) | |
| download | v8-1bf660fafd6c66fe862d5eef0b06e53e9967621b.tar.gz | |
Version 3.30.33.15 (cherry-pick)
Merged 21ce2464232e6496408bb90a291a0fbd87b1baf7
Correctly setup the freelist of the coderange on Win64
BUG=chromium:447555
LOG=N
R=svenpanne@chromium.org
Review URL: https://codereview.chromium.org/845963004
Cr-Commit-Position: refs/branch-heads/3.30@{#25269}
| -rw-r--r-- | src/heap/spaces.cc | 3 | ||||
| -rw-r--r-- | src/version.cc | 2 | ||||
| -rw-r--r-- | test/cctest/test-alloc.cc | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/heap/spaces.cc b/src/heap/spaces.cc index a73833f12..68425c08c 100644 --- a/src/heap/spaces.cc +++ b/src/heap/spaces.cc @@ -140,7 +140,8 @@ bool CodeRange::SetUp(size_t requested) { base += kReservedCodeRangePages * base::OS::CommitPageSize(); } Address aligned_base = RoundUp(base, MemoryChunk::kAlignment); - size_t size = code_range_->size() - (aligned_base - base); + size_t size = code_range_->size() - (aligned_base - base) - + kReservedCodeRangePages * base::OS::CommitPageSize(); allocation_list_.Add(FreeBlock(aligned_base, size)); current_allocation_block_index_ = 0; diff --git a/src/version.cc b/src/version.cc index 3a52a49ce..a2997459d 100644 --- a/src/version.cc +++ b/src/version.cc @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 30 #define BUILD_NUMBER 33 -#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 diff --git a/test/cctest/test-alloc.cc b/test/cctest/test-alloc.cc index 54d516e13..2e071acc7 100644 --- a/test/cctest/test-alloc.cc +++ b/test/cctest/test-alloc.cc @@ -198,7 +198,8 @@ TEST(CodeRange) { const size_t code_range_size = 32*MB; CcTest::InitializeVM(); CodeRange code_range(reinterpret_cast<Isolate*>(CcTest::isolate())); - code_range.SetUp(code_range_size); + code_range.SetUp(code_range_size + + kReservedCodeRangePages * v8::base::OS::CommitPageSize()); size_t current_allocated = 0; size_t total_allocated = 0; List< ::Block> blocks(1000); |