Diff
Modified: trunk/Source/bmalloc/ChangeLog (287245 => 287246)
--- trunk/Source/bmalloc/ChangeLog 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/ChangeLog 2021-12-19 20:34:07 UTC (rev 287246)
@@ -1,3 +1,137 @@
+2021-12-19 Yusuke Suzuki <[email protected]>
+
+ [libpas] Add macros to disable bmalloc core so that libpas can be enabled on 64-bit watchOS
+ https://bugs.webkit.org/show_bug.cgi?id=234481
+
+ Reviewed by David Kilzer.
+
+ This patch re-enables libpas for watchOS by disabling compilation of bmalloc core when libpas
+ is enabled.
+
+ Also we found that size of libbmalloc.a is misleading: it is just collection of object
+ files, thus it includes a lot of duplicate inline functions, which is deduped when linking
+ it to _javascript_Core.framework. Thus, that size does not directly reflect the final size of
+ _javascript_Core.framework.
+
+ Before and after this patch, we see 2.4MB size reduction in total.
+
+ 1. _javascript_Core.framework increases by 363KB.
+ Before: 32452544 _javascript_Core.framework/_javascript_Core
+ After: 32825088 _javascript_Core.framework/_javascript_Core
+
+ Most part of libbmalloc.a archive file is just many duplicate inline functions, which is deduped
+ in _javascript_Core.framework (archive file v.s. framework). After deduping and after removing bmalloc
+ core in this patch, it only increases 363KB. Removing bmalloc core code is contributing to 70KB reduction.
+
+ 2. WebCore.framework decreases by 2.75MB
+ Before: 72591584 WebCore.framework/WebCore
+ After: 69702240 WebCore.framework/WebCore
+
+ We can get 2.75MB size reduction if we enable libpas on WebCore. This is because how IsoHeap is
+ implemented in bmalloc v.s. libpas. In bmalloc, we use extensive amount of distinct template-based
+ IsoHeap code, which bloats code size. Plus, it uses very long function name strings to fix per-process
+ singleton linking issue happening for C++ template. Compared to that, libpas is just using very small
+ C structure and functions that can be much smaller than the bmalloc's IsoHeap's code which even duplicate
+ slow path code. As a result, switching to libpas offers 2.75MB size deduction.
+
+ * bmalloc/Algorithm.h:
+ * bmalloc/AllIsoHeaps.cpp:
+ * bmalloc/AllIsoHeaps.h:
+ * bmalloc/AllIsoHeapsInlines.h:
+ * bmalloc/Allocator.cpp:
+ * bmalloc/Allocator.h:
+ * bmalloc/BInline.h:
+ * bmalloc/BPlatform.h:
+ * bmalloc/Bits.h:
+ * bmalloc/BulkDecommit.h:
+ * bmalloc/BumpAllocator.h:
+ * bmalloc/BumpRange.h:
+ * bmalloc/Cache.cpp:
+ * bmalloc/Cache.h:
+ * bmalloc/Chunk.h:
+ * bmalloc/Deallocator.cpp:
+ * bmalloc/Deallocator.h:
+ * bmalloc/DeferredDecommit.h:
+ * bmalloc/DeferredDecommitInlines.h:
+ * bmalloc/DeferredTrigger.h:
+ * bmalloc/DeferredTriggerInlines.h:
+ * bmalloc/EligibilityResult.h:
+ * bmalloc/EligibilityResultInlines.h:
+ * bmalloc/Environment.h:
+ * bmalloc/FixedVector.h:
+ * bmalloc/FreeList.cpp:
+ * bmalloc/FreeList.h:
+ * bmalloc/FreeListInlines.h:
+ * bmalloc/Heap.cpp:
+ * bmalloc/Heap.h:
+ * bmalloc/HeapConstants.cpp:
+ * bmalloc/HeapConstants.h:
+ * bmalloc/IsoAllocator.h:
+ * bmalloc/IsoAllocatorInlines.h:
+ * bmalloc/IsoConfig.h:
+ * bmalloc/IsoDeallocator.h:
+ * bmalloc/IsoDeallocatorInlines.h:
+ * bmalloc/IsoDirectory.h:
+ * bmalloc/IsoDirectoryInlines.h:
+ * bmalloc/IsoDirectoryPage.h:
+ * bmalloc/IsoDirectoryPageInlines.h:
+ * bmalloc/IsoHeapImpl.cpp:
+ * bmalloc/IsoHeapImpl.h:
+ * bmalloc/IsoHeapImplInlines.h:
+ * bmalloc/IsoMallocFallback.h:
+ * bmalloc/IsoPage.cpp:
+ * bmalloc/IsoPage.h:
+ * bmalloc/IsoPageInlines.h:
+ * bmalloc/IsoPageTrigger.h:
+ * bmalloc/IsoSharedConfig.h:
+ * bmalloc/IsoSharedHeap.cpp:
+ * bmalloc/IsoSharedHeap.h:
+ * bmalloc/IsoSharedHeapInlines.h:
+ * bmalloc/IsoSharedPage.cpp:
+ * bmalloc/IsoSharedPage.h:
+ * bmalloc/IsoSharedPageInlines.h:
+ * bmalloc/IsoTLS.cpp:
+ * bmalloc/IsoTLS.h:
+ * bmalloc/IsoTLSAllocatorEntry.h:
+ * bmalloc/IsoTLSAllocatorEntryInlines.h:
+ * bmalloc/IsoTLSDeallocatorEntry.h:
+ * bmalloc/IsoTLSDeallocatorEntryInlines.h:
+ * bmalloc/IsoTLSEntry.cpp:
+ * bmalloc/IsoTLSEntry.h:
+ * bmalloc/IsoTLSEntryInlines.h:
+ * bmalloc/IsoTLSInlines.h:
+ * bmalloc/IsoTLSLayout.cpp:
+ * bmalloc/IsoTLSLayout.h:
+ * bmalloc/LargeMap.cpp:
+ * bmalloc/LargeMap.h:
+ * bmalloc/LargeRange.h:
+ * bmalloc/LineMetadata.h:
+ * bmalloc/List.h:
+ * bmalloc/Map.h:
+ * bmalloc/Object.h:
+ * bmalloc/ObjectType.cpp:
+ * bmalloc/ObjectType.h:
+ * bmalloc/ObjectTypeTable.cpp:
+ * bmalloc/ObjectTypeTable.h:
+ * bmalloc/Packed.h:
+ * bmalloc/PerHeapKind.h:
+ * bmalloc/PerProcess.cpp:
+ * bmalloc/PerProcess.h:
+ * bmalloc/PerThread.h:
+ * bmalloc/PhysicalPageMap.h:
+ * bmalloc/Range.h:
+ * bmalloc/Scavenger.cpp:
+ * bmalloc/Scavenger.h:
+ * bmalloc/Sizes.h:
+ * bmalloc/SmallLine.h:
+ * bmalloc/SmallPage.h:
+ * bmalloc/StdLibExtras.h:
+ * bmalloc/Syscall.h:
+ * bmalloc/VMAllocate.h:
+ * bmalloc/Vector.h:
+ * bmalloc/Zone.cpp:
+ * bmalloc/Zone.h:
+
2021-12-18 David Kilzer <[email protected]>
[libpas] Do not compile libpas for 64-bit watchOS to save ~6 MB per architecture
Modified: trunk/Source/bmalloc/bmalloc/Algorithm.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/Algorithm.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/Algorithm.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -23,8 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef Algorithm_h
-#define Algorithm_h
+#pragma once
#include "BAssert.h"
#include <algorithm>
@@ -300,5 +299,3 @@
}
} // namespace bmalloc
-
-#endif // Algorithm_h
Modified: trunk/Source/bmalloc/bmalloc/AllIsoHeaps.cpp (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/AllIsoHeaps.cpp 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/AllIsoHeaps.cpp 2021-12-19 20:34:07 UTC (rev 287246)
@@ -25,6 +25,8 @@
#include "AllIsoHeaps.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
DEFINE_STATIC_PER_PROCESS_STORAGE(AllIsoHeaps);
@@ -48,3 +50,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/AllIsoHeaps.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/AllIsoHeaps.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/AllIsoHeaps.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -29,8 +29,11 @@
#include "StaticPerProcess.h"
#include "Vector.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
+
class BEXPORT AllIsoHeaps : public StaticPerProcess<AllIsoHeaps> {
public:
AllIsoHeaps(const LockHolder&);
@@ -48,3 +51,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/AllIsoHeapsInlines.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/AllIsoHeapsInlines.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/AllIsoHeapsInlines.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -28,6 +28,8 @@
#include "AllIsoHeaps.h"
#include "IsoHeapImpl.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
template<typename Func>
@@ -39,3 +41,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/Allocator.cpp (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/Allocator.cpp 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/Allocator.cpp 2021-12-19 20:34:07 UTC (rev 287246)
@@ -34,6 +34,8 @@
#include <algorithm>
#include <cstdlib>
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
Allocator::Allocator(Heap& heap, Deallocator& deallocator)
@@ -170,3 +172,5 @@
}
} // namespace bmalloc
+
+#endif
Modified: trunk/Source/bmalloc/bmalloc/Allocator.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/Allocator.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/Allocator.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -23,8 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef Allocator_h
-#define Allocator_h
+#pragma once
#include "BExport.h"
#include "BumpAllocator.h"
@@ -31,6 +30,8 @@
#include "FailureAction.h"
#include <array>
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
class Deallocator;
@@ -96,4 +97,4 @@
} // namespace bmalloc
-#endif // Allocator_h
+#endif
Modified: trunk/Source/bmalloc/bmalloc/BInline.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/BInline.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/BInline.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -23,11 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef BInline_h
-#define BInline_h
+#pragma once
#define BINLINE __attribute__((always_inline)) inline
#define BNO_INLINE __attribute__((noinline))
-
-#endif // BInline_h
Modified: trunk/Source/bmalloc/bmalloc/BPlatform.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/BPlatform.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/BPlatform.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -324,7 +324,7 @@
/* BENABLE(LIBPAS) is enabling libpas build. But this does not mean we use libpas for bmalloc replacement. */
#if !defined(BENABLE_LIBPAS)
-#if BCPU(ADDRESS64) && ((BOS(DARWIN) && !BOS(WATCHOS)) || (BOS(LINUX) && !BPLATFORM(GTK) && !BPLATFORM(WPE)))
+#if BCPU(ADDRESS64) && (BOS(DARWIN) || (BOS(LINUX) && !BPLATFORM(GTK) && !BPLATFORM(WPE)))
#define BENABLE_LIBPAS 1
#else
#define BENABLE_LIBPAS 0
Modified: trunk/Source/bmalloc/bmalloc/Bits.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/Bits.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/Bits.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -29,6 +29,8 @@
#include "BInline.h"
#include <climits>
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
constexpr size_t bitsArrayLength(size_t numBits) { return (numBits + 31) / 32; }
@@ -504,3 +506,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/BulkDecommit.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/BulkDecommit.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/BulkDecommit.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -28,6 +28,8 @@
#include "VMAllocate.h"
#include <vector>
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
class BulkDecommit {
@@ -93,3 +95,5 @@
};
} // namespace bmalloc
+
+#endif
Modified: trunk/Source/bmalloc/bmalloc/BumpAllocator.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/BumpAllocator.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/BumpAllocator.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -23,13 +23,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef BumpAllocator_h
-#define BumpAllocator_h
+#pragma once
#include "BAssert.h"
#include "BumpRange.h"
#include "ObjectType.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
// Helper object for allocating small objects.
@@ -95,4 +96,4 @@
} // namespace bmalloc
-#endif // BumpAllocator_h
+#endif
Modified: trunk/Source/bmalloc/bmalloc/BumpRange.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/BumpRange.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/BumpRange.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -23,13 +23,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef BumpRange_h
-#define BumpRange_h
+#pragma once
#include "FixedVector.h"
#include "Range.h"
#include "Sizes.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
struct BumpRange {
@@ -41,4 +42,4 @@
} // namespace bmalloc
-#endif // BumpRange_h
+#endif
Modified: trunk/Source/bmalloc/bmalloc/Cache.cpp (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/Cache.cpp 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/Cache.cpp 2021-12-19 20:34:07 UTC (rev 287246)
@@ -30,6 +30,8 @@
#include "Heap.h"
#include "PerProcess.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
void Cache::scavenge(HeapKind heapKind)
@@ -103,3 +105,5 @@
}
} // namespace bmalloc
+
+#endif
Modified: trunk/Source/bmalloc/bmalloc/Cache.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/Cache.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/Cache.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -23,8 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef Cache_h
-#define Cache_h
+#pragma once
#include "Allocator.h"
#include "BExport.h"
@@ -32,6 +31,8 @@
#include "HeapKind.h"
#include "PerThread.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
// Per-thread allocation / deallocation cache, backed by a per-process Heap.
@@ -124,4 +125,4 @@
} // namespace bmalloc
-#endif // Cache_h
+#endif
Modified: trunk/Source/bmalloc/bmalloc/Chunk.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/Chunk.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/Chunk.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -23,8 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef Chunk_h
-#define Chunk_h
+#pragma once
#include "Object.h"
#include "Sizes.h"
@@ -33,6 +32,8 @@
#include "VMAllocate.h"
#include <array>
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
class Chunk : public ListNode<Chunk> {
@@ -173,4 +174,4 @@
}; // namespace bmalloc
-#endif // Chunk
+#endif
Modified: trunk/Source/bmalloc/bmalloc/Deallocator.cpp (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/Deallocator.cpp 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/Deallocator.cpp 2021-12-19 20:34:07 UTC (rev 287246)
@@ -35,6 +35,8 @@
#include <cstdlib>
#include <sys/mman.h>
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
Deallocator::Deallocator(Heap& heap)
@@ -83,3 +85,5 @@
}
} // namespace bmalloc
+
+#endif
Modified: trunk/Source/bmalloc/bmalloc/Deallocator.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/Deallocator.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/Deallocator.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -23,8 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef Deallocator_h
-#define Deallocator_h
+#pragma once
#include "BExport.h"
#include "FixedVector.h"
@@ -31,6 +30,8 @@
#include "SmallPage.h"
#include <mutex>
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
class Heap;
@@ -80,4 +81,4 @@
} // namespace bmalloc
-#endif // Deallocator_h
+#endif
Modified: trunk/Source/bmalloc/bmalloc/DeferredDecommit.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/DeferredDecommit.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/DeferredDecommit.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -25,6 +25,8 @@
#pragma once
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
class IsoDirectoryBaseBase;
@@ -41,3 +43,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/DeferredDecommitInlines.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/DeferredDecommitInlines.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/DeferredDecommitInlines.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -27,6 +27,8 @@
#include "DeferredDecommit.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
inline DeferredDecommit::DeferredDecommit()
@@ -42,3 +44,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/DeferredTrigger.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/DeferredTrigger.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/DeferredTrigger.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -29,6 +29,8 @@
#include "Mutex.h"
#include <mutex>
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
template<typename Config> class IsoPage;
@@ -50,3 +52,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/DeferredTriggerInlines.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/DeferredTriggerInlines.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/DeferredTriggerInlines.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -28,6 +28,8 @@
#include "BAssert.h"
#include "DeferredTrigger.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
template<IsoPageTrigger trigger>
@@ -54,3 +56,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/EligibilityResult.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/EligibilityResult.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/EligibilityResult.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -27,6 +27,8 @@
#include "IsoPage.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
enum class EligibilityKind {
@@ -48,3 +50,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/EligibilityResultInlines.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/EligibilityResultInlines.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/EligibilityResultInlines.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -27,6 +27,8 @@
#include "EligibilityResult.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
template<typename Config>
@@ -43,3 +45,5 @@
}
} // namespace bmalloc
+
+#endif
Modified: trunk/Source/bmalloc/bmalloc/Environment.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/Environment.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/Environment.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -23,8 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef Environment_h
-#define Environment_h
+#pragma once
#include "Mutex.h"
#include "StaticPerProcess.h"
@@ -45,5 +44,3 @@
DECLARE_STATIC_PER_PROCESS_STORAGE(Environment);
} // namespace bmalloc
-
-#endif // Environment_h
Modified: trunk/Source/bmalloc/bmalloc/FixedVector.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/FixedVector.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/FixedVector.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -23,8 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef FixedVector_h
-#define FixedVector_h
+#pragma once
#include "BAssert.h"
#include <array>
@@ -31,6 +30,8 @@
#include <cstddef>
#include <type_traits>
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
// A replacement for std::vector that uses a fixed-sized inline backing store.
@@ -113,4 +114,4 @@
} // namespace bmalloc
-#endif // FixedVector_h
+#endif
Modified: trunk/Source/bmalloc/bmalloc/FreeList.cpp (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/FreeList.cpp 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/FreeList.cpp 2021-12-19 20:34:07 UTC (rev 287246)
@@ -27,6 +27,8 @@
#include "FreeListInlines.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
FreeList::FreeList()
@@ -81,3 +83,4 @@
} // namespace JSC
+#endif
Modified: trunk/Source/bmalloc/bmalloc/FreeList.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/FreeList.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/FreeList.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -29,6 +29,8 @@
#include <cstddef>
#include <cstdint>
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
class VariadicBumpAllocator;
@@ -94,3 +96,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/FreeListInlines.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/FreeListInlines.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/FreeListInlines.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -27,6 +27,8 @@
#include "FreeList.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
template<typename Config, typename Func>
@@ -66,3 +68,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/Heap.cpp (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/Heap.cpp 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/Heap.cpp 2021-12-19 20:34:07 UTC (rev 287246)
@@ -46,18 +46,13 @@
#include "Zone.h"
#endif
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
-#if BUSE(LIBPAS) && BCOMPILER(CLANG)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wmissing-noreturn"
-#endif
Heap::Heap(HeapKind kind, LockHolder&)
: m_kind { kind }, m_constants { *HeapConstants::get() }
{
-#if BUSE(LIBPAS)
- RELEASE_BASSERT(!"Should not be using Heap if BUSE(LIBPAS)");
-#endif
BASSERT(!Environment::get()->isDebugHeapEnabled());
Gigacage::ensureGigacage();
@@ -70,9 +65,6 @@
m_scavenger = Scavenger::get();
}
-#if BUSE(LIBPAS) && BCOMPILER(CLANG)
-#pragma clang diagnostic pop
-#endif
bool Heap::usingGigacage()
{
@@ -685,3 +677,5 @@
}
} // namespace bmalloc
+
+#endif
Modified: trunk/Source/bmalloc/bmalloc/Heap.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/Heap.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/Heap.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -23,8 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef Heap_h
-#define Heap_h
+#pragma once
#include "BumpRange.h"
#include "Chunk.h"
@@ -46,6 +45,8 @@
#include <mutex>
#include <vector>
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
class BulkDecommit;
@@ -171,4 +172,4 @@
} // namespace bmalloc
-#endif // Heap_h
+#endif
Modified: trunk/Source/bmalloc/bmalloc/HeapConstants.cpp (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/HeapConstants.cpp 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/HeapConstants.cpp 2021-12-19 20:34:07 UTC (rev 287246)
@@ -26,6 +26,8 @@
#include "HeapConstants.h"
#include <algorithm>
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
DEFINE_STATIC_PER_PROCESS_STORAGE(HeapConstants);
@@ -129,3 +131,5 @@
}
} // namespace bmalloc
+
+#endif
Modified: trunk/Source/bmalloc/bmalloc/HeapConstants.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/HeapConstants.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/HeapConstants.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -33,6 +33,8 @@
#include <array>
#include <mutex>
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
class HeapConstants : public StaticPerProcess<HeapConstants> {
@@ -62,3 +64,5 @@
DECLARE_STATIC_PER_PROCESS_STORAGE(HeapConstants);
} // namespace bmalloc
+
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoAllocator.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoAllocator.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoAllocator.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -27,6 +27,8 @@
#include "FreeList.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
template<typename Config> class IsoPage;
@@ -52,3 +54,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoAllocatorInlines.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoAllocatorInlines.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoAllocatorInlines.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -31,6 +31,8 @@
#include "IsoHeapImplInlines.h"
#include "IsoPage.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
template<typename Config>
@@ -102,3 +104,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoConfig.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoConfig.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoConfig.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -25,6 +25,10 @@
#pragma once
+#include "BPlatform.h"
+
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
template<unsigned passedObjectSize>
@@ -34,3 +38,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoDeallocator.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoDeallocator.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoDeallocator.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -29,6 +29,8 @@
#include "IsoPage.h"
#include "Mutex.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
template<typename Config>
@@ -52,3 +54,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoDeallocatorInlines.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoDeallocatorInlines.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoDeallocatorInlines.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -32,6 +32,8 @@
#include "Mutex.h"
#include <mutex>
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
template<typename Config>
@@ -82,3 +84,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoDirectory.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoDirectory.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoDirectory.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -31,6 +31,8 @@
#include "Packed.h"
#include "Vector.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
template<typename Config> class IsoHeapImpl;
@@ -94,3 +96,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoDirectoryInlines.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoDirectoryInlines.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoDirectoryInlines.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -27,6 +27,8 @@
#include "IsoDirectory.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
template<typename Config>
@@ -155,3 +157,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoDirectoryPage.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoDirectoryPage.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoDirectoryPage.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -28,6 +28,8 @@
#include "BMalloced.h"
#include "IsoDirectory.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
template<typename Config>
@@ -58,3 +60,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoDirectoryPageInlines.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoDirectoryPageInlines.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoDirectoryPageInlines.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -27,6 +27,8 @@
#include "IsoDirectoryPageInlines.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
template<typename Config>
@@ -45,3 +47,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoHeapImpl.cpp (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoHeapImpl.cpp 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoHeapImpl.cpp 2021-12-19 20:34:07 UTC (rev 287246)
@@ -29,6 +29,8 @@
#include "PerProcess.h"
#include <climits>
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
IsoHeapImplBase::IsoHeapImplBase(Mutex& lock)
@@ -95,3 +97,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoHeapImpl.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoHeapImpl.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoHeapImpl.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -32,6 +32,8 @@
#include "Packed.h"
#include "PhysicalPageMap.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
class AllIsoHeaps;
@@ -142,4 +144,4 @@
} // namespace bmalloc
-
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoHeapImplInlines.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoHeapImplInlines.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoHeapImplInlines.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -30,6 +30,8 @@
#include "IsoSharedHeapInlines.h"
#include "IsoSharedPageInlines.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
template<typename Config>
@@ -326,3 +328,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoMallocFallback.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoMallocFallback.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoMallocFallback.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -82,4 +82,3 @@
);
} } // namespace bmalloc::IsoMallocFallback
-
Modified: trunk/Source/bmalloc/bmalloc/IsoPage.cpp (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoPage.cpp 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoPage.cpp 2021-12-19 20:34:07 UTC (rev 287246)
@@ -28,6 +28,8 @@
#include "PerProcess.h"
#include "VMAllocate.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
void* IsoPageBase::allocatePageMemory()
@@ -36,3 +38,5 @@
}
} // namespace bmalloc
+
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoPage.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoPage.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoPage.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -32,6 +32,8 @@
#include <climits>
#include <mutex>
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
class IsoHeapImplBase;
@@ -128,3 +130,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoPageInlines.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoPageInlines.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoPageInlines.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -32,6 +32,8 @@
#include "StdLibExtras.h"
#include "VMAllocate.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
template<typename Config>
@@ -254,3 +256,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoPageTrigger.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoPageTrigger.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoPageTrigger.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -25,6 +25,8 @@
#pragma once
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
enum class IsoPageTrigger {
@@ -34,3 +36,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoSharedConfig.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoSharedConfig.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoSharedConfig.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -27,6 +27,8 @@
#include "IsoConfig.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
static constexpr unsigned alignmentForIsoSharedAllocation = 16;
@@ -33,3 +35,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoSharedHeap.cpp (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoSharedHeap.cpp 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoSharedHeap.cpp 2021-12-19 20:34:07 UTC (rev 287246)
@@ -25,8 +25,12 @@
#include "IsoSharedHeap.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
DEFINE_STATIC_PER_PROCESS_STORAGE(IsoSharedHeap);
} // namespace bmalloc
+
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoSharedHeap.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoSharedHeap.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoSharedHeap.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -29,6 +29,8 @@
#include "IsoSharedPage.h"
#include "StaticPerProcess.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
class AllIsoHeaps;
@@ -71,4 +73,4 @@
} // namespace bmalloc
-
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoSharedHeapInlines.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoSharedHeapInlines.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoSharedHeapInlines.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -30,6 +30,8 @@
#include "IsoSharedPage.h"
#include "StdLibExtras.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
template<unsigned objectSize, typename Func>
@@ -82,3 +84,5 @@
}
} // namespace bmalloc
+
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoSharedPage.cpp (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoSharedPage.cpp 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoSharedPage.cpp 2021-12-19 20:34:07 UTC (rev 287246)
@@ -28,6 +28,8 @@
#include "StdLibExtras.h"
#include "VMAllocate.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
IsoSharedPage* IsoSharedPage::tryCreate()
@@ -41,3 +43,5 @@
} // namespace bmalloc
+
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoSharedPage.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoSharedPage.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoSharedPage.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -29,6 +29,8 @@
#include "IsoPage.h"
#include "IsoSharedConfig.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
class IsoHeapImplBase;
@@ -58,3 +60,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoSharedPageInlines.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoSharedPageInlines.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoSharedPageInlines.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -29,6 +29,8 @@
#include "StdLibExtras.h"
#include "VMAllocate.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
// IsoSharedPage never becomes empty state again after we allocate some cells from IsoSharedPage. This makes IsoSharedPage management super simple.
@@ -71,3 +73,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoTLS.cpp (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoTLS.cpp 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoTLS.cpp 2021-12-19 20:34:07 UTC (rev 287246)
@@ -32,6 +32,8 @@
#include <stdio.h>
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
#if !HAVE_PTHREAD_MACHDEP_H
@@ -174,3 +176,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoTLS.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoTLS.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoTLS.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -28,6 +28,8 @@
#include "PerThread.h"
#include <cstddef>
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
class IsoTLSEntry;
@@ -108,3 +110,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoTLSAllocatorEntry.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoTLSAllocatorEntry.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoTLSAllocatorEntry.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -28,6 +28,8 @@
#include "IsoAllocator.h"
#include "IsoTLSEntry.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
template<typename Config> class IsoHeapImpl;
@@ -50,3 +52,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoTLSAllocatorEntryInlines.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoTLSAllocatorEntryInlines.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoTLSAllocatorEntryInlines.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -27,6 +27,8 @@
#include "IsoHeapImpl.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
template<typename Config>
@@ -54,3 +56,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoTLSDeallocatorEntry.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoTLSDeallocatorEntry.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoTLSDeallocatorEntry.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -30,6 +30,8 @@
#include "Mutex.h"
#include <mutex>
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
template<typename Config>
@@ -51,3 +53,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoTLSDeallocatorEntryInlines.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoTLSDeallocatorEntryInlines.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoTLSDeallocatorEntryInlines.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -25,6 +25,8 @@
#pragma once
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
template<typename Config>
@@ -51,3 +53,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoTLSEntry.cpp (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoTLSEntry.cpp 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoTLSEntry.cpp 2021-12-19 20:34:07 UTC (rev 287246)
@@ -29,6 +29,8 @@
#include "PerProcess.h"
#include <climits>
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
IsoTLSEntry::IsoTLSEntry(size_t size)
@@ -42,3 +44,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoTLSEntry.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoTLSEntry.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoTLSEntry.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -30,6 +30,8 @@
#include "IsoTLSLayout.h"
#include <climits>
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
class IsoTLS;
@@ -109,3 +111,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoTLSEntryInlines.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoTLSEntryInlines.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoTLSEntryInlines.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -27,6 +27,8 @@
#include "IsoTLSEntry.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
template<typename Func>
@@ -66,3 +68,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoTLSInlines.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoTLSInlines.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoTLSInlines.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -31,6 +31,8 @@
#include "IsoTLS.h"
#include "bmalloc.h"
+#if !BUSE(LIBPAS)
+
#if BOS(DARWIN)
#include <malloc/malloc.h>
#endif
@@ -188,3 +190,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoTLSLayout.cpp (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoTLSLayout.cpp 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoTLSLayout.cpp 2021-12-19 20:34:07 UTC (rev 287246)
@@ -27,6 +27,8 @@
#include "IsoTLSEntry.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
DEFINE_STATIC_PER_PROCESS_STORAGE(IsoTLSLayout);
@@ -61,3 +63,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/IsoTLSLayout.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/IsoTLSLayout.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/IsoTLSLayout.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -29,6 +29,8 @@
#include "StaticPerProcess.h"
#include <mutex>
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
class IsoTLSEntry;
@@ -49,3 +51,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/LargeMap.cpp (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/LargeMap.cpp 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/LargeMap.cpp 2021-12-19 20:34:07 UTC (rev 287246)
@@ -26,6 +26,8 @@
#include "LargeMap.h"
#include <utility>
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
LargeRange LargeMap::remove(size_t alignment, size_t size)
@@ -87,3 +89,5 @@
}
} // namespace bmalloc
+
+#endif
Modified: trunk/Source/bmalloc/bmalloc/LargeMap.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/LargeMap.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/LargeMap.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -23,13 +23,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef LargeMap_h
-#define LargeMap_h
+#pragma once
#include "LargeRange.h"
#include "Vector.h"
#include <algorithm>
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
class LargeMap {
@@ -51,4 +52,4 @@
} // namespace bmalloc
-#endif // LargeMap_h
+#endif
Modified: trunk/Source/bmalloc/bmalloc/LargeRange.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/LargeRange.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/LargeRange.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -23,12 +23,13 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef LargeRange_h
-#define LargeRange_h
+#pragma once
#include "BAssert.h"
#include "Range.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
class LargeRange : public Range {
@@ -190,4 +191,4 @@
} // namespace bmalloc
-#endif // LargeRange_h
+#endif
Modified: trunk/Source/bmalloc/bmalloc/LineMetadata.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/LineMetadata.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/LineMetadata.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -27,6 +27,8 @@
#include "Sizes.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
struct LineMetadata {
@@ -43,3 +45,5 @@
"maximum object count must fit in LineMetadata::objectCount");
} // namespace bmalloc
+
+#endif
Modified: trunk/Source/bmalloc/bmalloc/List.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/List.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/List.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -23,9 +23,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef List_h
-#define List_h
+#pragma once
+#include "BPlatform.h"
+
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
template<typename T>
@@ -120,4 +123,4 @@
} // namespace bmalloc
-#endif // List_h
+#endif
Modified: trunk/Source/bmalloc/bmalloc/Map.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/Map.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/Map.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -23,13 +23,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef Map_h
-#define Map_h
+#pragma once
#include "BInline.h"
#include "Sizes.h"
#include "Vector.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
class SmallPage;
@@ -131,4 +132,4 @@
} // namespace bmalloc
-#endif // Map_h
+#endif
Modified: trunk/Source/bmalloc/bmalloc/Object.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/Object.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/Object.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -23,11 +23,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef Object_h
-#define Object_h
+#pragma once
#include <cstddef>
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
class Chunk;
@@ -78,4 +79,4 @@
}; // namespace bmalloc
-#endif // Object_h
+#endif
Modified: trunk/Source/bmalloc/bmalloc/ObjectType.cpp (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/ObjectType.cpp 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/ObjectType.cpp 2021-12-19 20:34:07 UTC (rev 287246)
@@ -30,6 +30,8 @@
#include "Object.h"
#include "PerProcess.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
ObjectType objectType(Heap& heap, void* object)
@@ -46,3 +48,5 @@
}
} // namespace bmalloc
+
+#endif
Modified: trunk/Source/bmalloc/bmalloc/ObjectType.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/ObjectType.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/ObjectType.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -23,13 +23,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef ObjectType_h
-#define ObjectType_h
+#pragma once
#include "BAssert.h"
#include "HeapKind.h"
#include "Sizes.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
class Heap;
@@ -45,4 +46,4 @@
} // namespace bmalloc
-#endif // ObjectType_h
+#endif
Modified: trunk/Source/bmalloc/bmalloc/ObjectTypeTable.cpp (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/ObjectTypeTable.cpp 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/ObjectTypeTable.cpp 2021-12-19 20:34:07 UTC (rev 287246)
@@ -27,6 +27,8 @@
#include "VMAllocate.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
ObjectTypeTable::Bits sentinelBits { nullptr, 0, 0 };
@@ -103,3 +105,5 @@
}
} // namespace bmalloc
+
+#endif
Modified: trunk/Source/bmalloc/bmalloc/ObjectTypeTable.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/ObjectTypeTable.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/ObjectTypeTable.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -34,6 +34,8 @@
#include <mach/vm_param.h>
#endif
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
class Chunk;
@@ -135,3 +137,5 @@
}
} // namespace bmalloc
+
+#endif
Modified: trunk/Source/bmalloc/bmalloc/Packed.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/Packed.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/Packed.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -33,6 +33,8 @@
#include <mach/vm_param.h>
#endif
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
template<typename T>
@@ -237,3 +239,5 @@
};
} // namespace bmalloc
+
+#endif
Modified: trunk/Source/bmalloc/bmalloc/PerHeapKind.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/PerHeapKind.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/PerHeapKind.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -28,6 +28,8 @@
#include "HeapKind.h"
#include <array>
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
template<typename T>
@@ -105,3 +107,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/PerProcess.cpp (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/PerProcess.cpp 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/PerProcess.cpp 2021-12-19 20:34:07 UTC (rev 287246)
@@ -28,6 +28,8 @@
#include "VMAllocate.h"
#include <stdio.h>
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
static constexpr unsigned tableSize = 100;
@@ -89,3 +91,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/PerProcess.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/PerProcess.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/PerProcess.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -29,6 +29,8 @@
#include "Mutex.h"
#include "Sizes.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
// Usage:
@@ -129,3 +131,5 @@
PerProcessData* PerProcess<T>::s_data { nullptr };
} // namespace bmalloc
+
+#endif
Modified: trunk/Source/bmalloc/bmalloc/PerThread.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/PerThread.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/PerThread.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -23,8 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef PerThread_h
-#define PerThread_h
+#pragma once
#include "BInline.h"
#include "BPlatform.h"
@@ -44,6 +43,8 @@
#define HAVE_PTHREAD_MACHDEP_H 0
#endif
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
// Usage:
@@ -158,4 +159,4 @@
} // namespace bmalloc
-#endif // PerThread_h
+#endif
Modified: trunk/Source/bmalloc/bmalloc/PhysicalPageMap.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/PhysicalPageMap.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/PhysicalPageMap.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -30,6 +30,8 @@
#include "VMAllocate.h"
#include <unordered_set>
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
// This class is useful for debugging bmalloc's footprint.
@@ -72,4 +74,5 @@
} // namespace bmalloc
+#endif
#endif // ENABLE_PHYSICAL_PAGE_MAP
Modified: trunk/Source/bmalloc/bmalloc/Range.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/Range.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/Range.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -23,12 +23,13 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef Range_h
-#define Range_h
+#pragma once
#include <algorithm>
#include <cstddef>
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
class Range {
@@ -70,4 +71,4 @@
} // namespace bmalloc
-#endif // Range_h
+#endif
Modified: trunk/Source/bmalloc/bmalloc/Scavenger.cpp (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/Scavenger.cpp 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/Scavenger.cpp 2021-12-19 20:34:07 UTC (rev 287246)
@@ -44,6 +44,8 @@
#include <pthread_np.h>
#endif
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
static constexpr bool verbose = false;
@@ -379,3 +381,4 @@
} // namespace bmalloc
+#endif
Modified: trunk/Source/bmalloc/bmalloc/Scavenger.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/Scavenger.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/Scavenger.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -38,6 +38,8 @@
#include <dispatch/dispatch.h>
#endif
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
class Scavenger : public StaticPerProcess<Scavenger> {
@@ -125,4 +127,4 @@
} // namespace bmalloc
-
+#endif
Modified: trunk/Source/bmalloc/bmalloc/Sizes.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/Sizes.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/Sizes.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -23,8 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef Sizes_h
-#define Sizes_h
+#pragma once
#include "Algorithm.h"
#include "BPlatform.h"
@@ -134,5 +133,3 @@
using namespace Sizes;
} // namespace bmalloc
-
-#endif // Sizes_h
Modified: trunk/Source/bmalloc/bmalloc/SmallLine.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/SmallLine.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/SmallLine.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -23,8 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef SmallLine_h
-#define SmallLine_h
+#pragma once
#include "BAssert.h"
#include "Mutex.h"
@@ -31,6 +30,8 @@
#include "ObjectType.h"
#include <mutex>
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
class SmallLine {
@@ -66,4 +67,4 @@
} // namespace bmalloc
-#endif // SmallLine_h
+#endif
Modified: trunk/Source/bmalloc/bmalloc/SmallPage.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/SmallPage.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/SmallPage.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -23,8 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef SmallPage_h
-#define SmallPage_h
+#pragma once
#include "BAssert.h"
#include "List.h"
@@ -32,6 +31,8 @@
#include "VMAllocate.h"
#include <mutex>
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
class SmallLine;
@@ -92,4 +93,4 @@
} // namespace bmalloc
-#endif // SmallPage_h
+#endif
Modified: trunk/Source/bmalloc/bmalloc/StdLibExtras.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/StdLibExtras.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/StdLibExtras.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -23,8 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef StdLibExtras_h
-#define StdLibExtras_h
+#pragma once
#include "BCompiler.h"
#include <memory>
@@ -47,5 +46,3 @@
}
} // namespace bmalloc
-
-#endif // StdLibExtras_h
Modified: trunk/Source/bmalloc/bmalloc/Syscall.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/Syscall.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/Syscall.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -23,8 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef Syscall_h
-#define Syscall_h
+#pragma once
#include <errno.h>
@@ -31,5 +30,3 @@
#define SYSCALL(x) do { \
while ((x) == -1 && errno == EAGAIN) { } \
} while (0);
-
-#endif // Syscall_h
Modified: trunk/Source/bmalloc/bmalloc/VMAllocate.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/VMAllocate.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/VMAllocate.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -23,8 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef VMAllocate_h
-#define VMAllocate_h
+#pragma once
#include "BAssert.h"
#include "BVMTags.h"
@@ -265,5 +264,3 @@
}
} // namespace bmalloc
-
-#endif // VMAllocate_h
Modified: trunk/Source/bmalloc/bmalloc/Vector.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/Vector.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/Vector.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -23,8 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef Vector_h
-#define Vector_h
+#pragma once
#include "BInline.h"
#include "VMAllocate.h"
@@ -233,5 +232,3 @@
}
} // namespace bmalloc
-
-#endif // Vector_h
Modified: trunk/Source/bmalloc/bmalloc/Zone.cpp (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/Zone.cpp 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/Zone.cpp 2021-12-19 20:34:07 UTC (rev 287246)
@@ -26,6 +26,8 @@
#include "Sizes.h"
#include "Zone.h"
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
template<typename T> static void remoteRead(task_t task, memory_reader_t reader, vm_address_t remotePointer, T& result)
@@ -130,3 +132,5 @@
}
} // namespace bmalloc
+
+#endif
Modified: trunk/Source/bmalloc/bmalloc/Zone.h (287245 => 287246)
--- trunk/Source/bmalloc/bmalloc/Zone.h 2021-12-19 20:24:24 UTC (rev 287245)
+++ trunk/Source/bmalloc/bmalloc/Zone.h 2021-12-19 20:34:07 UTC (rev 287246)
@@ -23,8 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef Zone_h
-#define Zone_h
+#pragma once
#include "FixedVector.h"
#include "Mutex.h"
@@ -33,6 +32,8 @@
#include <malloc/malloc.h>
#include <mutex>
+#if !BUSE(LIBPAS)
+
namespace bmalloc {
class Chunk;
@@ -73,4 +74,4 @@
} // namespace bmalloc
-#endif // Zone_h
+#endif
