Changeset 294905 in webkit

Timestamp:

May 26, 2022, 3:51:13 PM (4 years ago)

Author:

mark.lam@apple.com

Message:

Re-factoring clean up in allocateCell and tryAllocateCell.
​https://bugs.webkit.org/show_bug.cgi?id=240973

Reviewed by Saam Barati.

The AllocationFailureMode should be a template parameter to tryAllocateCellHelper because it's
constant. Also, tryAllocateCellHelper should take a VM& instead of taking a Heap& and then
converting it back to a VM&.

• Source/JavaScriptCore/runtime/JSCellInlines.h:

(JSC::tryAllocateCellHelper):
(JSC::allocateCell):
(JSC::tryAllocateCell):

Canonical link: ​https://commits.webkit.org/251028@main

File:

• trunk/Source/JavaScriptCore/runtime/JSCellInlines.h (modified) (6 diffs)

trunk/Source/JavaScriptCore/runtime/JSCellInlines.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2012-2021 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-2022 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -168 +168 @@
 }
 
-template<typename T>
-ALWAYS_INLINE void* tryAllocateCellHelper(Heap& heap, size_t size, GCDeferralContext* deferralContext, AllocationFailureMode failureMode)
-{
-    VM& vm = heap.vm();
-    ASSERT(deferralContext || heap.isDeferred() || !DisallowGC::isInEffectOnCurrentThread());
+template<typename T, AllocationFailureMode failureMode>
+ALWAYS_INLINE void* tryAllocateCellHelper(VM& vm, size_t size, GCDeferralContext* deferralContext)
+{
+    ASSERT(deferralContext || vm.heap.isDeferred() || !DisallowGC::isInEffectOnCurrentThread());
     ASSERT(size >= sizeof(T));
     JSCell* result = static_cast<JSCell*>(subspaceFor<T>(vm)->allocate(vm, size, deferralContext, failureMode));
-    if (failureMode == AllocationFailureMode::ReturnNull && !result)
-        return nullptr;
+    if constexpr (failureMode == AllocationFailureMode::ReturnNull) {
+        if (!result)
+            return nullptr;
+    }
 #if ENABLE(GC_VALIDATION)
     ASSERT(!vm.isInitializingObject());
@@ -188 +189 @@
 void* allocateCell(VM& vm, size_t size)
 {
-    return tryAllocateCellHelper<T>(vm.heap, size, nullptr, AllocationFailureMode::Assert);
+    return tryAllocateCellHelper<T, AllocationFailureMode::Assert>(vm, size, nullptr);
 }
 
@@ -194 +195 @@
 void* tryAllocateCell(VM& vm, size_t size)
 {
-    return tryAllocateCellHelper<T>(vm.heap, size, nullptr, AllocationFailureMode::ReturnNull);
+    return tryAllocateCellHelper<T, AllocationFailureMode::ReturnNull>(vm, size, nullptr);
 }
 
@@ -200 +201 @@
 void* allocateCell(VM& vm, GCDeferralContext* deferralContext, size_t size)
 {
-    return tryAllocateCellHelper<T>(vm.heap, size, deferralContext, AllocationFailureMode::Assert);
+    return tryAllocateCellHelper<T, AllocationFailureMode::Assert>(vm, size, deferralContext);
 }
 
@@ -206 +207 @@
 void* tryAllocateCell(VM& vm, GCDeferralContext* deferralContext, size_t size)
 {
-    return tryAllocateCellHelper<T>(vm.heap, size, deferralContext, AllocationFailureMode::ReturnNull);
+    return tryAllocateCellHelper<T, AllocationFailureMode::ReturnNull>(vm, size, deferralContext);
 }