Version 4.8.2.1 (cherry-pick)

test/cctest/test-spaces.cc

Index: test/cctest/test-spaces.cc
diff --git a/test/cctest/test-spaces.cc b/test/cctest/test-spaces.cc
index 8132990c9a21427036a920d0ab0b32e8ff0fd194..a744bb79a7d4658acd5209158b021a4095d8c48e 100644
--- a/test/cctest/test-spaces.cc
+++ b/test/cctest/test-spaces.cc
@@ -426,8 +426,7 @@ TEST(CompactionSpace) {
   // Cannot loop until "Available()" since we initially have 0 bytes available
   // and would thus neither grow, nor be able to allocate an object.
   const int kNumObjects = 100;
-  const int kExpectedPages = (kNumObjects / (compaction_space->AreaSize() /
-                                             Page::kMaxRegularHeapObjectSize));
+  const int kExpectedPages = kNumObjects;
   for (int i = 0; i < kNumObjects; i++) {
     compaction_space->AllocateRawUnaligned(Page::kMaxRegularHeapObjectSize)
         .ToObjectChecked();