Version 5.0.71.2 (cherry-pick)

test/unittests/heap/slot-set-unittest.cc

Index: test/unittests/heap/slot-set-unittest.cc
diff --git a/test/unittests/heap/slot-set-unittest.cc b/test/unittests/heap/slot-set-unittest.cc
index 26a26f0258435e8096d30b364575a57601a60eed..376188915a4b4004034c67087ad8029b0602f584 100644
--- a/test/unittests/heap/slot-set-unittest.cc
+++ b/test/unittests/heap/slot-set-unittest.cc
@@ -55,9 +55,9 @@ TEST(SlotSet, Iterate) {
   set.Iterate([](Address slot_address) {
     uintptr_t intaddr = reinterpret_cast<uintptr_t>(slot_address);
     if (intaddr % 3 == 0) {
-      return KEEP_SLOT;
+      return SlotSet::KEEP_SLOT;
     } else {
-      return REMOVE_SLOT;
+      return SlotSet::REMOVE_SLOT;
     }
   });
 
@@ -139,33 +139,5 @@ TEST(SlotSet, RemoveRange) {
   }
 }
 
-TEST(TypedSlotSet, Iterate) {
-  TypedSlotSet set(0);
-  const int kDelta = 10000001;
-  int added = 0;
-  for (uint32_t i = 0; i < TypedSlotSet::kMaxOffset; i += kDelta) {
-    SlotType type = static_cast<SlotType>(i % NUMBER_OF_SLOT_TYPES);
-    set.Insert(type, i);
-    ++added;
-  }
-  int iterated = 0;
-  set.Iterate([&iterated, kDelta](SlotType type, Address addr) {
-    uint32_t i = static_cast<uint32_t>(reinterpret_cast<uintptr_t>(addr));
-    EXPECT_EQ(i % NUMBER_OF_SLOT_TYPES, static_cast<uint32_t>(type));
-    EXPECT_EQ(0, i % kDelta);
-    ++iterated;
-    return i % 2 == 0 ? KEEP_SLOT : REMOVE_SLOT;
-  });
-  EXPECT_EQ(added, iterated);
-  iterated = 0;
-  set.Iterate([&iterated](SlotType type, Address addr) {
-    uint32_t i = static_cast<uint32_t>(reinterpret_cast<uintptr_t>(addr));
-    EXPECT_EQ(0, i % 2);
-    ++iterated;
-    return KEEP_SLOT;
-  });
-  EXPECT_EQ(added / 2, iterated);
-}
-
 }  // namespace internal
 }  // namespace v8