Version 4.8.271.17 (cherry-pick)

ulan · ulan · commit fa163e2edbee · 2016-01-12T15:14:07.000Z
Merged a373e75 Guard UnmapFreeMemoryTask with a flag. BUG=chromium:574349 LOG=N R=hablich@chromium.org Review URL: https://codereview.chromium.org/1581663002 . Cr-Commit-Position: refs/branch-heads/4.8@{#20} Cr-Branched-From: 10449d4-refs/heads/4.8.271@{#1} Cr-Branched-From: 2ebd5fc-refs/heads/master@{#31941}
diff --git a/include/v8-version.h b/include/v8-version.h
@@ -11,7 +11,7 @@
 #define V8_MAJOR_VERSION 4
 #define V8_MINOR_VERSION 8
 #define V8_BUILD_NUMBER 271
-#define V8_PATCH_LEVEL 16
+#define V8_PATCH_LEVEL 17
 
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
diff --git a/src/heap/heap.cc b/src/heap/heap.cc
@@ -6070,9 +6070,14 @@ void Heap::FilterStoreBufferEntriesOnAboutToBeFreedPages() {
 
 void Heap::FreeQueuedChunks() {
   if (chunks_queued_for_free_ != NULL) {
-    V8::GetCurrentPlatform()->CallOnBackgroundThread(
-        new UnmapFreeMemoryTask(this, chunks_queued_for_free_),
-        v8::Platform::kShortRunningTask);
+    if (FLAG_concurrent_sweeping) {
+      V8::GetCurrentPlatform()->CallOnBackgroundThread(
+          new UnmapFreeMemoryTask(this, chunks_queued_for_free_),
+          v8::Platform::kShortRunningTask);
+    } else {
+      FreeQueuedChunks(chunks_queued_for_free_);
+      pending_unmapping_tasks_semaphore_.Signal();
+    }
     chunks_queued_for_free_ = NULL;
   } else {
     // If we do not have anything to unmap, we just signal the semaphore
