Rename WTF::Bitmap to WTF::BitSet

https://bugs.webkit.org/show_bug.cgi?id=259168
rdar://112167937

Reviewed by Yusuke Suzuki.

Bitmap makes it sound like an image, but it's not.

Also, BitSet provides symmetry with std::bitset, which is a
very similar class.

* Source/JavaScriptCore/assembler/SecureARM64EHashPins.h:
* Source/JavaScriptCore/bytecode/BytecodeLivenessAnalysis.cpp:
(JSC::tmpLivenessForCheckpoint):
* Source/JavaScriptCore/bytecode/BytecodeLivenessAnalysis.h:
* Source/JavaScriptCore/heap/IsoCellSet.cpp:
(JSC::IsoCellSet::addSlow):
* Source/JavaScriptCore/heap/IsoCellSet.h:
* Source/JavaScriptCore/heap/MarkedBlock.h:
(JSC::MarkedBlock::marks const):
(JSC::MarkedBlock::newlyAllocated const):
* Source/JavaScriptCore/heap/VerifierSlotVisitor.h:
(JSC::VerifierSlotVisitor::MarkedBlockData::atoms const):
* Source/JavaScriptCore/heap/VerifierSlotVisitorInlines.h:
(JSC::VerifierSlotVisitor::forEachLiveMarkedBlockCell):
* Source/JavaScriptCore/jit/RegisterSet.h:
* Source/JavaScriptCore/runtime/IntlObject.cpp:
(JSC::LanguageTagParser::parseExtensionsAndPUExtensions):
* Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp:
(JSC::makeCharacterBitmap):
(JSC::encode):
(JSC::decode):
(JSC::JSC_DEFINE_HOST_FUNCTION):
* Source/JavaScriptCore/yarr/YarrJIT.h:
* Source/JavaScriptCore/yarr/YarrPattern.cpp:
(JSC::Yarr::CharacterClassConstructor::asciiOpSorted):
(JSC::Yarr::CharacterClassConstructor::unicodeOpSorted):
* Source/WTF/WTF.xcodeproj/project.pbxproj:
* Source/WTF/wtf/BitSet.h: Renamed from Source/WTF/wtf/Bitmap.h.
(WTF::WordType>::get const):
(WTF::WordType>::set):
(WTF::WordType>::testAndSet):
(WTF::WordType>::testAndClear):
(WTF::WordType>::concurrentTestAndSet):
(WTF::WordType>::concurrentTestAndClear):
(WTF::WordType>::clear):
(WTF::WordType>::clearAll):
(WTF::WordType>::cleanseLastWord):
(WTF::WordType>::setAll):
(WTF::WordType>::invert):
(WTF::WordType>::nextPossiblyUnset const):
(WTF::WordType>::findRunOfZeros const):
(WTF::WordType>::count const):
(WTF::WordType>::isEmpty const):
(WTF::WordType>::isFull const):
(WTF::WordType>::merge):
(WTF::WordType>::filter):
(WTF::WordType>::exclude):
(WTF::WordType>::concurrentFilter):
(WTF::WordType>::subsumes const):
(WTF::WordType>::forEachSetBit const):
(WTF::WordType>::findBit const):
(WTF::WordType>::mergeAndClear):
(WTF::WordType>::setAndClear):
(WTF::WordType>::setEachNthBit):
(WTF::= const):
(WTF::=):
(WTF::WordType>::hash const):
(WTF::WordType>::dump const):
* Source/WTF/wtf/BitVector.h:
* Source/WTF/wtf/cocoa/RuntimeApplicationChecksCocoa.h:
* Source/WebCore/style/StyleBuilderState.h:
* Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
* Tools/TestWebKitAPI/Tests/WTF/BitSet.cpp: Added.
(TestWebKitAPI::countBits):
(TestWebKitAPI::testBitSetSize):
(TestWebKitAPI::testBitSetConstructedEmpty):
(TestWebKitAPI::testBitSetSetGet):
(TestWebKitAPI::testBitSetTestAndSet):
(TestWebKitAPI::testBitSetTestAndClear):
(TestWebKitAPI::testBitSetConcurrentTestAndSet):
(TestWebKitAPI::testBitSetConcurrentTestAndClear):
(TestWebKitAPI::testBitSetClear):
(TestWebKitAPI::testBitSetClearAll):
(TestWebKitAPI::testBitSetInvert):
(TestWebKitAPI::testBitSetFindRunOfZeros):
(TestWebKitAPI::testBitSetCount):
(TestWebKitAPI::testBitSetCountAfterSetAll):
(TestWebKitAPI::testBitSetIsEmpty):
(TestWebKitAPI::testBitSetIsFull):
(TestWebKitAPI::testBitSetMerge):
(TestWebKitAPI::testBitSetFilter):
(TestWebKitAPI::testBitSetExclude):
(TestWebKitAPI::testBitSetConcurrentFilter):
(TestWebKitAPI::testBitSetSubsumes):
(TestWebKitAPI::testBitSetForEachSetBit):
(TestWebKitAPI::testBitSetFindBit):
(TestWebKitAPI::testBitSetIteration):
(TestWebKitAPI::testBitSetMergeAndClear):
(TestWebKitAPI::testBitSetSetAndClear):
(TestWebKitAPI::testBitSetSetEachNthBitImpl):
(TestWebKitAPI::testBitSetSetEachNthBit):
(TestWebKitAPI::testBitSetOperatorEqual):
(TestWebKitAPI::testBitSetOperatorNotEqual):
(TestWebKitAPI::testBitSetOperatorAssignmentImpl):
(TestWebKitAPI::testBitSetOperatorAssignment):
(TestWebKitAPI::testBitSetOperatorBitOrAssignmentImpl):
(TestWebKitAPI::testBitSetOperatorBitOrAssignment):
(TestWebKitAPI::testBitSetOperatorBitAndAssignmentImpl):
(TestWebKitAPI::testBitSetOperatorBitAndAssignment):
(TestWebKitAPI::testBitSetOperatorBitXorAssignmentImpl):
(TestWebKitAPI::testBitSetOperatorBitXorAssignment):
(TestWebKitAPI::testBitSetHash):
(TestWebKitAPI::TEST):
* Tools/TestWebKitAPI/Tests/WTF/Bitmap.cpp: Removed.

Canonical link: https://commits.webkit.org/266023@main

Source/JavaScriptCore/assembler/SecureARM64EHashPins.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Apple Inc. All rights reserved.
+ * Copyright (C) 2022-2023 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,7 +27,7 @@
 
 #if CPU(ARM64E) && ENABLE(JIT)
 
-#include <wtf/Bitmap.h>
+#include <wtf/BitSet.h>
 
 namespace JSC {
 
@@ -95,7 +95,7 @@ class SecureARM64EHashPins {
         Page* next { nullptr };
     private:
         Entry* entries() { return bitwise_cast<Entry*>(this + 1); }
-        Bitmap<numEntriesPerPage> isInUseMap;
+        WTF::BitSet<numEntriesPerPage> isInUseMap;
     };
 
     static_assert(sizeof(Page) % alignof(Entry) == 0);

Source/JavaScriptCore/bytecode/BytecodeLivenessAnalysis.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2023 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -165,9 +165,9 @@ constexpr bool enumValuesEqualAsIntegral(EnumType1 v1, EnumType2 v2)
         return static_cast<IntType2>(v1) == static_cast<IntType2>(v2);
 }
 
-Bitmap<maxNumCheckpointTmps> tmpLivenessForCheckpoint(const CodeBlock& codeBlock, BytecodeIndex bytecodeIndex)
+WTF::BitSet<maxNumCheckpointTmps> tmpLivenessForCheckpoint(const CodeBlock& codeBlock, BytecodeIndex bytecodeIndex)
 {
-    Bitmap<maxNumCheckpointTmps> result;
+    WTF::BitSet<maxNumCheckpointTmps> result;
     Checkpoint checkpoint = bytecodeIndex.checkpoint();
 
     if (!checkpoint)

Source/JavaScriptCore/bytecode/BytecodeLivenessAnalysis.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2023 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -28,7 +28,7 @@
 #include "BytecodeBasicBlock.h"
 #include "BytecodeGraph.h"
 #include "CodeBlock.h"
-#include <wtf/Bitmap.h>
+#include <wtf/BitSet.h>
 #include <wtf/FastBitVector.h>
 
 namespace JSC {
@@ -95,7 +95,7 @@ class BytecodeLivenessAnalysis : private BytecodeLivenessPropagation {
     BytecodeGraph m_graph;
 };
 
-Bitmap<maxNumCheckpointTmps> tmpLivenessForCheckpoint(const CodeBlock&, BytecodeIndex);
+WTF::BitSet<maxNumCheckpointTmps> tmpLivenessForCheckpoint(const CodeBlock&, BytecodeIndex);
 
 inline bool operandIsAlwaysLive(int operand);
 inline bool operandThatIsNotAlwaysLiveIsLive(const FastBitVector& out, int operand);

Source/JavaScriptCore/heap/IsoCellSet.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2017-2023 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -80,13 +80,13 @@ Ref<SharedTask<MarkedBlock::Handle*()>> IsoCellSet::parallelNotEmptyMarkedBlockS
     return adoptRef(*new Task(*this));
 }
 
-NEVER_INLINE Bitmap<MarkedBlock::atomsPerBlock>* IsoCellSet::addSlow(unsigned blockIndex)
+NEVER_INLINE WTF::BitSet<MarkedBlock::atomsPerBlock>* IsoCellSet::addSlow(unsigned blockIndex)
 {
     Locker locker { m_subspace.m_directory.m_bitvectorLock };
     auto& bitsPtrRef = m_bits[blockIndex];
     auto* bits = bitsPtrRef.get();
     if (!bits) {
-        bitsPtrRef = makeUnique<Bitmap<MarkedBlock::atomsPerBlock>>();
+        bitsPtrRef = makeUnique<WTF::BitSet<MarkedBlock::atomsPerBlock>>();
         bits = bitsPtrRef.get();
         WTF::storeStoreFence();
         m_blocksWithBits[blockIndex] = true;

Source/JavaScriptCore/heap/IsoCellSet.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2021 Apple Inc. All rights reserved.
+ * Copyright (C) 2017-2023 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -26,7 +26,7 @@
 #pragma once
 
 #include "MarkedBlock.h"
-#include <wtf/Bitmap.h>
+#include <wtf/BitSet.h>
 #include <wtf/ConcurrentVector.h>
 #include <wtf/FastBitVector.h>
 #include <wtf/Noncopyable.h>
@@ -71,14 +71,14 @@ class IsoCellSet final : public PackedRawSentinelNode<IsoCellSet> {
 private:
     friend class IsoSubspace;
 
-    Bitmap<MarkedBlock::atomsPerBlock>* addSlow(unsigned blockIndex);
+    WTF::BitSet<MarkedBlock::atomsPerBlock>* addSlow(unsigned blockIndex);
 
     void didResizeBits(unsigned newSize);
     void didRemoveBlock(unsigned blockIndex);
     void sweepToFreeList(MarkedBlock::Handle*);
     void clearLowerTierCell(unsigned);
 
-    Bitmap<MarkedBlock::maxNumberOfLowerTierCells> m_lowerTierBits;
+    WTF::BitSet<MarkedBlock::maxNumberOfLowerTierCells> m_lowerTierBits;
 
     IsoSubspace& m_subspace;
 
@@ -87,7 +87,7 @@ class IsoCellSet final : public PackedRawSentinelNode<IsoCellSet> {
     // clears all bits for a block, we keep it set in blocksWithBits.
 
     FastBitVector m_blocksWithBits;
-    ConcurrentVector<std::unique_ptr<Bitmap<MarkedBlock::atomsPerBlock>>> m_bits;
+    ConcurrentVector<std::unique_ptr<WTF::BitSet<MarkedBlock::atomsPerBlock>>> m_bits;
 };
 
 } // namespace JSC

Source/JavaScriptCore/heap/MarkedBlock.h

@@ -1,7 +1,7 @@
 /*
  *  Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
  *  Copyright (C) 2001 Peter Kelly (pmk@post.com)
- *  Copyright (C) 2003-2022 Apple Inc. All rights reserved.
+ *  Copyright (C) 2003-2023 Apple Inc. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -28,7 +28,7 @@
 #include <algorithm>
 #include <type_traits>
 #include <wtf/Atomics.h>
-#include <wtf/Bitmap.h>
+#include <wtf/BitSet.h>
 #include <wtf/CountingLock.h>
 #include <wtf/HashFunctions.h>
 #include <wtf/IterationStatus.h>
@@ -302,8 +302,8 @@ class MarkedBlock {
         HeapVersion m_markingVersion;
         HeapVersion m_newlyAllocatedVersion;
 
-        Bitmap<atomsPerBlock> m_marks;
-        Bitmap<atomsPerBlock> m_newlyAllocated;
+        WTF::BitSet<atomsPerBlock> m_marks;
+        WTF::BitSet<atomsPerBlock> m_newlyAllocated;
         void* m_verifierMemo { nullptr };
     };
 
@@ -357,7 +357,7 @@ class MarkedBlock {
     bool isNewlyAllocated(const void*);
     void setNewlyAllocated(const void*);
     void clearNewlyAllocated(const void*);
-    const Bitmap<atomsPerBlock>& newlyAllocated() const;
+    const WTF::BitSet<atomsPerBlock>& newlyAllocated() const;
 
     HeapVersion newlyAllocatedVersion() const { return header().m_newlyAllocatedVersion; }
 
@@ -395,7 +395,7 @@ class MarkedBlock {
     bool isMarkedRaw(const void* p);
     HeapVersion markingVersion() const { return header().m_markingVersion; }
 
-    const Bitmap<atomsPerBlock>& marks() const;
+    const WTF::BitSet<atomsPerBlock>& marks() const;
 
     CountingLock& lock() { return header().m_lock; }
 
@@ -623,7 +623,7 @@ inline bool MarkedBlock::testAndSetMarked(const void* p, Dependency dependency)
     return header().m_marks.concurrentTestAndSet(atomNumber(p), dependency);
 }
 
-inline const Bitmap<MarkedBlock::atomsPerBlock>& MarkedBlock::marks() const
+inline const WTF::BitSet<MarkedBlock::atomsPerBlock>& MarkedBlock::marks() const
 {
     return header().m_marks;
 }
@@ -643,7 +643,7 @@ inline void MarkedBlock::clearNewlyAllocated(const void* p)
     header().m_newlyAllocated.clear(atomNumber(p));
 }
 
-inline const Bitmap<MarkedBlock::atomsPerBlock>& MarkedBlock::newlyAllocated() const
+inline const WTF::BitSet<MarkedBlock::atomsPerBlock>& MarkedBlock::newlyAllocated() const
 {
     return header().m_newlyAllocated;
 }

Source/JavaScriptCore/heap/VerifierSlotVisitor.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Apple Inc. All rights reserved.
+ * Copyright (C) 2021-2023 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,7 +31,7 @@
 #include "VisitRaceKey.h"
 #include "Weak.h"
 #include <memory>
-#include <wtf/Bitmap.h>
+#include <wtf/BitSet.h>
 #include <wtf/Deque.h>
 #include <wtf/FastMalloc.h>
 #include <wtf/HashMap.h>
@@ -120,12 +120,12 @@ class VerifierSlotVisitor : public AbstractSlotVisitor {
         WTF_MAKE_FAST_ALLOCATED;
         WTF_MAKE_NONCOPYABLE(MarkedBlockData);
     public:
-        using AtomsBitmap = Bitmap<MarkedBlock::atomsPerBlock>;
+        using AtomsBitSet = WTF::BitSet<MarkedBlock::atomsPerBlock>;
 
         MarkedBlockData(MarkedBlock*);
 
         MarkedBlock* block() const { return m_block; }
-        const AtomsBitmap& atoms() const { return m_atoms; }
+        const AtomsBitSet& atoms() const { return m_atoms; }
 
         bool isMarked(unsigned atomNumber) { return m_atoms.get(atomNumber); }
         bool testAndSetMarked(unsigned atomNumber) { return m_atoms.testAndSet(atomNumber); }
@@ -135,7 +135,7 @@ class VerifierSlotVisitor : public AbstractSlotVisitor {
 
     private:
         MarkedBlock* m_block { nullptr };
-        AtomsBitmap m_atoms;
+        AtomsBitSet m_atoms;
         Vector<MarkerData> m_markers;
     };
 

Source/JavaScriptCore/heap/VerifierSlotVisitorInlines.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Apple Inc. All rights reserved.
+ * Copyright (C) 2021-2023 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -52,7 +52,7 @@ void VerifierSlotVisitor::forEachLiveMarkedBlockCell(const Functor& func)
     for (auto& entry : m_markedBlockMap) {
         auto& data = entry.value;
         MarkedBlock* block = data->block();
-        const MarkedBlockData::AtomsBitmap& atoms =  data->atoms();
+        const MarkedBlockData::AtomsBitSet& atoms = data->atoms();
         for (auto atomNumber : atoms)
             func(bitwise_cast<HeapCell*>(block->handle().atomAt(atomNumber)));
     }

Source/JavaScriptCore/jit/RegisterSet.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2021 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2023 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -33,13 +33,13 @@
 #include "MemoryMode.h"
 #include "Reg.h"
 #include "Width.h"
-#include <wtf/Bitmap.h>
+#include <wtf/BitSet.h>
 #include <wtf/CommaPrinter.h>
 
 namespace JSC {
 
 class ScalarRegisterSet;
-typedef Bitmap<MacroAssembler::numGPRs + MacroAssembler::numFPRs> RegisterBitmap;
+using RegisterBitSet = WTF::BitSet<MacroAssembler::numGPRs + MacroAssembler::numFPRs>;
 class RegisterAtOffsetList;
 struct RegisterSetBuilderHash;
 class RegisterSet;
@@ -186,8 +186,8 @@ class RegisterSetBuilder final {
     static constexpr unsigned gprOffset = 0;
     static constexpr unsigned fprOffset = gprOffset + MacroAssembler::numGPRs;
 
-    RegisterBitmap m_bits = { };
-    RegisterBitmap m_upperBits = { };
+    RegisterBitSet m_bits = { };
+    RegisterBitSet m_upperBits = { };
 
 public:
     JS_EXPORT_PRIVATE static RegisterSet allGPRs();
@@ -244,14 +244,14 @@ class RegisterSet final {
 
     inline size_t numberOfSetGPRs() const
     {
-        RegisterBitmap temp = m_bits;
+        RegisterBitSet temp = m_bits;
         temp.filter(RegisterSetBuilder::allGPRs().m_bits);
         return temp.count();
     }
 
     inline size_t numberOfSetFPRs() const
     {
-        RegisterBitmap temp = m_bits;
+        RegisterBitSet temp = m_bits;
         temp.filter(RegisterSetBuilder::allFPRs().m_bits);
         return temp.count();
     }
@@ -322,7 +322,7 @@ class RegisterSet final {
     public:
         inline constexpr iterator() { }
 
-        inline constexpr iterator(const RegisterBitmap::iterator& iter)
+        inline constexpr iterator(const RegisterBitSet::iterator& iter)
             : m_iter(iter)
         {
         }
@@ -341,7 +341,7 @@ class RegisterSet final {
         }
 
     private:
-        RegisterBitmap::iterator m_iter;
+        RegisterBitSet::iterator m_iter;
     };
 
     inline constexpr iterator begin() const { return iterator(m_bits.begin()); }
@@ -418,8 +418,8 @@ class RegisterSet final {
     inline constexpr bool operator==(const RegisterSet& other) const { return m_bits == other.m_bits && m_upperBits == other.m_upperBits; }
 
 private:
-    RegisterBitmap m_bits = { };
-    RegisterBitmap m_upperBits = { };
+    RegisterBitSet m_bits = { };
+    RegisterBitSet m_upperBits = { };
 };
 
 constexpr RegisterSetBuilder::RegisterSetBuilder(RegisterSet set)
@@ -502,14 +502,14 @@ class ScalarRegisterSet final {
 
     inline size_t numberOfSetGPRs() const
     {
-        RegisterBitmap temp = m_bits;
+        RegisterBitSet temp = m_bits;
         temp.filter(RegisterSetBuilder::allGPRs().m_bits);
         return temp.count();
     }
 
     inline size_t numberOfSetFPRs() const
     {
-        RegisterBitmap temp = m_bits;
+        RegisterBitSet temp = m_bits;
         temp.filter(RegisterSetBuilder::allFPRs().m_bits);
         return temp.count();
     }
@@ -522,7 +522,7 @@ class ScalarRegisterSet final {
     void dump(PrintStream& out) const { toRegisterSet().dump(out); }
 
 private:
-    RegisterBitmap m_bits;
+    RegisterBitSet m_bits;
 };
 
 constexpr ScalarRegisterSet RegisterSetBuilder::buildScalarRegisterSet() const

Source/JavaScriptCore/runtime/IntlObject.cpp

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2015 Andy VanWagoner (andy@vanwagoner.family)
  * Copyright (C) 2015 Sukolsak Sakshuwong (sukolsak@gmail.com)
- * Copyright (C) 2016-2021 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-2023 Apple Inc. All rights reserved.
  * Copyright (C) 2020 Sony Interactive Entertainment Inc.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -1442,7 +1442,7 @@ bool LanguageTagParser::parseExtensionsAndPUExtensions()
     //
     // pu_extensions = sep [xX] (sep alphanum{1,8})+ ;
     ASSERT(!isEOS());
-    Bitmap<numberOfUnicodeSingletons> singletonsSet { };
+    WTF::BitSet<numberOfUnicodeSingletons> singletonsSet { };
     while (true) {
         if (m_current.length() != 1)
             return true;