Skip to content

Commit 42ae9aa

Browse files
cdumezcdumez
committed
Drop CheckedLock / CheckedCondition aliases
https://bugs.webkit.org/show_bug.cgi?id=226176 Reviewed by Kate Cheney. Drop CheckedLock / CheckedCondition aliases now that they are the default. Source/JavaScriptCore: * API/JSVirtualMachine.mm: * API/glib/JSCVirtualMachine.cpp: * assembler/PerfLog.h: * assembler/testmasm.cpp: * bytecode/StructureStubInfo.h: * bytecode/SuperSampler.cpp: * dfg/DFGCommon.cpp: * dfg/DFGCommonData.cpp: * dfg/DFGPlan.h: * dfg/DFGThreadData.h: * dfg/DFGWorklist.cpp: (JSC::DFG::Worklist::Worklist): * dfg/DFGWorklist.h: * disassembler/Disassembler.cpp: * dynbench.cpp: * heap/BlockDirectory.cpp: (JSC::BlockDirectory::parallelNotEmptyBlockSource): * heap/BlockDirectory.h: (JSC::BlockDirectory::bitvectorLock): * heap/CodeBlockSet.h: (JSC::CodeBlockSet::getLock): * heap/Heap.cpp: (JSC::Heap::Heap): * heap/Heap.h: * heap/IsoSubspacePerVM.h: * heap/MarkedSpace.h: (JSC::MarkedSpace::directoryLock): * heap/MarkingConstraintSolver.h: * heap/SlotVisitor.cpp: (JSC::SlotVisitor::donateKnownParallel): * heap/SlotVisitor.h: * inspector/remote/socket/RemoteInspectorConnectionClient.h: * inspector/remote/socket/RemoteInspectorSocketEndpoint.h: * jit/ExecutableAllocator.cpp: (JSC::ExecutableAllocator::getLock const): (JSC::dumpJITMemory): * jit/ExecutableAllocator.h: (JSC::ExecutableAllocatorBase::getLock const): * jit/JITWorklist.cpp: (JSC::JITWorklist::JITWorklist): * jit/JITWorklist.h: * jsc.cpp: * profiler/ProfilerDatabase.h: * runtime/ConcurrentJSLock.h: * runtime/DeferredWorkTimer.h: * runtime/JSLock.h: * runtime/SamplingProfiler.cpp: (JSC::FrameWalker::FrameWalker): (JSC::CFrameWalker::CFrameWalker): (JSC::SamplingProfiler::takeSample): * runtime/SamplingProfiler.h: (JSC::SamplingProfiler::getLock): * runtime/VM.h: * runtime/VMTraps.cpp: (JSC::VMTraps::invalidateCodeBlocksOnStack): (JSC::VMTraps::VMTraps): * runtime/VMTraps.h: * tools/FunctionOverrides.h: * tools/VMInspector.cpp: (JSC::ensureIsSafeToLock): * tools/VMInspector.h: (JSC::VMInspector::getLock): * wasm/WasmCalleeRegistry.h: (JSC::Wasm::CalleeRegistry::getLock): * wasm/WasmPlan.h: * wasm/WasmStreamingCompiler.h: * wasm/WasmThunks.h: * wasm/WasmWorklist.cpp: (JSC::Wasm::Worklist::Worklist): * wasm/WasmWorklist.h: Source/WebCore: * Modules/indexeddb/IDBObjectStore.h: * Modules/indexeddb/IDBTransaction.h: * Modules/indexeddb/client/IDBConnectionProxy.h: * Modules/indexeddb/server/IDBSerializationContext.cpp: * Modules/indexeddb/server/IDBServer.cpp: * Modules/mediastream/RTCDataChannel.cpp: * Modules/mediastream/RTCRtpSFrameTransformer.h: * Modules/mediastream/RTCRtpScriptTransform.h: * Modules/mediastream/libwebrtc/LibWebRTCDataChannelHandler.h: * Modules/mediastream/libwebrtc/LibWebRTCRtpTransformBackend.h: * Modules/speech/SpeechRecognitionCaptureSourceImpl.h: * Modules/webaudio/AudioParamTimeline.h: * Modules/webaudio/MediaElementAudioSourceNode.h: * Modules/webdatabase/Database.cpp: * Modules/webdatabase/Database.h: * Modules/webdatabase/DatabaseManager.h: * Modules/webdatabase/DatabaseTask.h: * Modules/webdatabase/DatabaseThread.h: * Modules/webdatabase/DatabaseTracker.cpp: (WebCore::DatabaseTracker::openDatabaseMutex): * Modules/webdatabase/DatabaseTracker.h: * Modules/webdatabase/OriginLock.cpp: * Modules/webdatabase/SQLCallbackWrapper.h: * Modules/webdatabase/SQLTransaction.h: * Modules/webgpu/WebGPUDevice.cpp: (WebCore::WebGPUDevice::instancesLock): * Modules/webgpu/WebGPUDevice.h: * Modules/webgpu/WebGPUPipeline.cpp: (WebCore::WebGPUPipeline::instancesLock): * Modules/webgpu/WebGPUPipeline.h: * Modules/websockets/WebSocket.cpp: (WebCore::WebSocket::allActiveWebSocketsLock): * Modules/websockets/WebSocket.h: * accessibility/isolatedtree/AXIsolatedTree.cpp: * accessibility/isolatedtree/AXIsolatedTree.h: * bindings/js/JSDOMGlobalObject.h: * bridge/objc/WebScriptObject.mm: * crypto/CryptoAlgorithmRegistry.h: * dom/MessagePort.cpp: * dom/Node.cpp: * dom/ScriptExecutionContext.cpp: * html/HTMLMediaElement.cpp: (WebCore::HTMLMediaElement::createMediaPlayer): * html/canvas/CanvasRenderingContext.cpp: (WebCore::CanvasRenderingContext::instancesLock): * html/canvas/CanvasRenderingContext.h: * html/canvas/WebGLContextGroup.cpp: (WebCore::WebGLContextGroup::objectGraphLockForAContext): * html/canvas/WebGLContextGroup.h: * html/canvas/WebGLContextObject.cpp: (WebCore::WebGLContextObject::objectGraphLockForContext): * html/canvas/WebGLContextObject.h: * html/canvas/WebGLObject.h: * html/canvas/WebGLProgram.cpp: (WebCore::WebGLProgram::instancesLock): * html/canvas/WebGLProgram.h: * html/canvas/WebGLRenderingContextBase.cpp: (WebCore::WebGLRenderingContextBase::objectGraphLock): * html/canvas/WebGLRenderingContextBase.h: * html/canvas/WebGLSharedObject.cpp: (WebCore::WebGLSharedObject::objectGraphLockForContext): * html/canvas/WebGLSharedObject.h: * inspector/agents/WebHeapAgent.cpp: * page/ResourceUsageThread.h: * page/SecurityPolicy.cpp: * page/WheelEventTestMonitor.h: * page/scrolling/ScrollingTree.h: (WebCore::ScrollingTree::WTF_RETURNS_LOCK): * page/scrolling/ScrollingTreeLatchingController.h: * page/scrolling/ThreadedScrollingTree.h: (WebCore::ThreadedScrollingTree::WTF_RETURNS_LOCK): * page/scrolling/mac/ScrollingTreeMac.h: * platform/AbortableTaskQueue.h: * platform/GenericTaskQueue.cpp: * platform/GenericTaskQueue.h: * platform/LegacySchemeRegistry.cpp: * platform/audio/AudioDestination.h: * platform/audio/HRTFDatabaseLoader.h: * platform/audio/ReverbConvolver.cpp: (WebCore::ReverbConvolver::backgroundThreadEntry): * platform/audio/cocoa/AudioDestinationCocoa.h: * platform/audio/gstreamer/AudioSourceProviderGStreamer.h: * platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp: * platform/audio/mac/FFTFrameMac.cpp: * platform/encryptedmedia/CDMProxy.h: * platform/graphics/MediaPlayer.cpp: * platform/graphics/ShadowBlur.cpp: (WebCore::ScratchBuffer::lock): (WebCore::ShadowBlur::drawRectShadowWithTiling): (WebCore::ShadowBlur::drawInsetShadowWithTiling): * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h: * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp: * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h: * platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm: * platform/graphics/cg/IOSurfacePool.h: * platform/graphics/cg/SubimageCacheWithTimer.h: * platform/graphics/cocoa/FontCacheCoreText.cpp: * platform/graphics/gstreamer/ImageDecoderGStreamer.h: * platform/graphics/gstreamer/MainThreadNotifier.h: * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h: * platform/graphics/gstreamer/VideoSinkGStreamer.cpp: * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp: * platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp: * platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamer.cpp: * platform/graphics/texmap/TextureMapperPlatformLayerProxy.h: (WebCore::TextureMapperPlatformLayerProxy::WTF_RETURNS_LOCK): * platform/image-decoders/ScalableImageDecoder.h: * platform/ios/QuickLook.mm: * platform/ios/WebSQLiteDatabaseTrackerClient.mm: * platform/ios/wak/WebCoreThreadRun.cpp: * platform/mediarecorder/MediaRecorderPrivateMock.h: * platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.h: * platform/mediastream/RealtimeMediaSource.h: * platform/mediastream/RealtimeOutgoingAudioSource.h: * platform/mediastream/RealtimeOutgoingVideoSource.h: * platform/mediastream/cocoa/AudioMediaStreamTrackRendererUnit.h: * platform/mediastream/gstreamer/RealtimeOutgoingAudioSourceLibWebRTC.h: * platform/network/cf/LoaderRunLoopCF.cpp: (WebCore::loaderRunLoop): * platform/network/cocoa/WebCoreNSURLSession.mm: * platform/network/mac/UTIUtilities.mm: * platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.h: * platform/sql/SQLiteDatabase.cpp: * platform/sql/SQLiteDatabase.h: * platform/sql/SQLiteDatabaseTracker.cpp: * platform/text/TextEncodingRegistry.cpp: * storage/StorageQuotaManager.h: * workers/WorkerGlobalScope.cpp: * workers/WorkerOrWorkletScriptController.h: * workers/WorkerOrWorkletThread.cpp: (WebCore::WorkerOrWorkletThread::workerOrWorkletThreadsLock): * workers/WorkerOrWorkletThread.h: * worklets/PaintWorkletGlobalScope.h: Source/WebKit: * GPUProcess/graphics/RemoteGraphicsContextGL.cpp: (WebKit::RemoteGraphicsContextGL::paintPixelBufferToImageBuffer): * GPUProcess/webrtc/LibWebRTCCodecsProxy.h: * NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp: * NetworkProcess/Classifier/WebResourceLoadStatisticsStore.h: * NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.h: * NetworkProcess/IndexedDB/WebIDBServer.cpp: * NetworkProcess/NetworkProcess.h: * NetworkProcess/WebStorage/StorageManagerSet.h: * NetworkProcess/cache/NetworkCacheStorage.cpp: * NetworkProcess/cocoa/LaunchServicesDatabaseObserver.h: * NetworkProcess/glib/DNSCache.h: * Platform/IPC/Connection.cpp: * Platform/IPC/Connection.h: * Platform/IPC/StreamConnectionWorkQueue.h: * Platform/IPC/StreamServerConnection.h: * Shared/BlockingResponseMap.h: * Shared/Cocoa/XPCEndpointClient.h: * Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h: * Shared/mac/MediaFormatReader/MediaFormatReader.h: * Shared/mac/MediaFormatReader/MediaSampleCursor.h: * Shared/mac/MediaFormatReader/MediaTrackReader.h: * UIProcess/API/glib/IconDatabase.h: * UIProcess/WebURLSchemeTask.h: * UIProcess/mac/DisplayLink.h: * UIProcess/mac/WKPrintingView.mm: (-[WKPrintingView knowsPageRange:]): * WebProcess/GPU/graphics/RemoteImageBufferProxy.h: * WebProcess/GPU/webrtc/LibWebRTCCodecs.h: * WebProcess/Network/WebSocketStream.cpp: * WebProcess/Plugins/PluginProcessConnectionManager.h: * WebProcess/WebPage/EventDispatcher.h: * WebProcess/WebPage/ViewUpdateDispatcher.h: Source/WebKitLegacy: * Storage/StorageAreaSync.h: Source/WebKitLegacy/mac: * DOM/DOMInternal.mm: Source/WTF: * WTF.xcodeproj/project.pbxproj: * wtf/Assertions.cpp: * wtf/AutomaticThread.cpp: (WTF::AutomaticThreadCondition::wait): (WTF::AutomaticThreadCondition::waitFor): (WTF::AutomaticThread::AutomaticThread): * wtf/AutomaticThread.h: * wtf/CMakeLists.txt: * wtf/CheckedCondition.h: Removed. * wtf/CheckedLock.h: Removed. * wtf/Condition.h: * wtf/CrossThreadQueue.h: * wtf/CrossThreadTaskHandler.h: * wtf/CryptographicallyRandomNumber.cpp: * wtf/FastMalloc.cpp: * wtf/Forward.h: * wtf/Language.cpp: * wtf/Lock.cpp: (WTF::UncheckedLock::lockSlow): (WTF::UncheckedLock::unlockSlow): (WTF::UncheckedLock::unlockFairlySlow): (WTF::UncheckedLock::safepointSlow): * wtf/Lock.h: (WTF::WTF_ASSERTS_ACQUIRED_LOCK): * wtf/Logger.cpp: * wtf/Logger.h: (WTF::Logger::WTF_RETURNS_LOCK): * wtf/MessageQueue.h: * wtf/MetaAllocator.cpp: (WTF::MetaAllocator::release): (WTF::MetaAllocator::MetaAllocator): (WTF::MetaAllocator::allocate): (WTF::MetaAllocator::currentStatistics): * wtf/MetaAllocator.h: * wtf/OSLogPrintStream.h: * wtf/ParallelHelperPool.cpp: (WTF::ParallelHelperPool::ParallelHelperPool): * wtf/ParallelHelperPool.h: * wtf/ParallelJobsGeneric.h: * wtf/ParallelVectorIterator.h: * wtf/ReadWriteLock.h: * wtf/RecursiveLockAdapter.h: * wtf/RunLoop.h: * wtf/SynchronizedFixedQueue.h: * wtf/Threading.cpp: (WTF::Thread::allThreadsLock): * wtf/Threading.h: * wtf/TimingScope.cpp: * wtf/URL.cpp: * wtf/WTFSemaphore.h: * wtf/WorkQueue.cpp: (WTF::WorkQueue::concurrentApply): * wtf/WorkerPool.cpp: (WTF::WorkerPool::WorkerPool): * wtf/WorkerPool.h: * wtf/cf/LanguageCF.cpp: * wtf/text/AtomStringImpl.cpp: (WTF::AtomStringTableLocker::AtomStringTableLocker): * wtf/text/StringView.cpp: * wtf/threads/BinarySemaphore.h: * wtf/unicode/icu/CollatorICU.cpp: Tools: * TestWebKitAPI/CMakeLists.txt: * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: * TestWebKitAPI/Tests/WTF/CheckedConditionTest.cpp: Removed. * TestWebKitAPI/Tests/WTF/CheckedLockTest.cpp: Removed. * TestWebKitAPI/Tests/WTF/Condition.cpp: (TestWebKitAPI::TEST): * TestWebKitAPI/Tests/WTF/Lock.cpp: (TestWebKitAPI::TEST): * TestWebKitAPI/Tests/WTF/MetaAllocator.cpp: * WebKitTestRunner/InjectedBundle/AccessibilityController.cpp: (WTR::AXThread::createThreadIfNeeded): Canonical link: https://commits.webkit.org/238085@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@277958 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent cc6c5fb commit 42ae9aa

171 files changed

Lines changed: 828 additions & 609 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Source/JavaScriptCore/API/JSVirtualMachine.mm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@
3838
#import "SigillCrashAnalyzer.h"
3939
#import "SlotVisitorInlines.h"
4040
#import <mutex>
41-
#import <wtf/CheckedLock.h>
41+
#import <wtf/Lock.h>
4242
#import <wtf/RetainPtr.h>
4343

4444
static NSMapTable *globalWrapperCache = 0;
4545

46-
static CheckedLock wrapperCacheMutex;
46+
static Lock wrapperCacheMutex;
4747

4848
static void initWrapperCache()
4949
{

‎Source/JavaScriptCore/API/glib/JSCVirtualMachine.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
#include "JSCContextPrivate.h"
2424
#include "JSCVirtualMachinePrivate.h"
2525
#include "JSContextRef.h"
26-
#include <wtf/CheckedLock.h>
2726
#include <wtf/HashMap.h>
27+
#include <wtf/Lock.h>
2828
#include <wtf/NeverDestroyed.h>
2929
#include <wtf/glib/WTFGType.h>
3030

@@ -49,7 +49,7 @@ struct _JSCVirtualMachinePrivate {
4949

5050
WEBKIT_DEFINE_TYPE(JSCVirtualMachine, jsc_virtual_machine, G_TYPE_OBJECT)
5151

52-
static CheckedLock wrapperCacheMutex;
52+
static Lock wrapperCacheMutex;
5353

5454
static HashMap<JSContextGroupRef, JSCVirtualMachine*>& wrapperMap() WTF_REQUIRES_LOCK(wrapperCacheMutex)
5555
{

‎Source/JavaScriptCore/ChangeLog‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,83 @@
1+
2021-05-24 Chris Dumez <cdumez@apple.com>
2+
3+
Drop CheckedLock / CheckedCondition aliases
4+
https://bugs.webkit.org/show_bug.cgi?id=226176
5+
6+
Reviewed by Kate Cheney.
7+
8+
Drop CheckedLock / CheckedCondition aliases now that they are the default.
9+
10+
* API/JSVirtualMachine.mm:
11+
* API/glib/JSCVirtualMachine.cpp:
12+
* assembler/PerfLog.h:
13+
* assembler/testmasm.cpp:
14+
* bytecode/StructureStubInfo.h:
15+
* bytecode/SuperSampler.cpp:
16+
* dfg/DFGCommon.cpp:
17+
* dfg/DFGCommonData.cpp:
18+
* dfg/DFGPlan.h:
19+
* dfg/DFGThreadData.h:
20+
* dfg/DFGWorklist.cpp:
21+
(JSC::DFG::Worklist::Worklist):
22+
* dfg/DFGWorklist.h:
23+
* disassembler/Disassembler.cpp:
24+
* dynbench.cpp:
25+
* heap/BlockDirectory.cpp:
26+
(JSC::BlockDirectory::parallelNotEmptyBlockSource):
27+
* heap/BlockDirectory.h:
28+
(JSC::BlockDirectory::bitvectorLock):
29+
* heap/CodeBlockSet.h:
30+
(JSC::CodeBlockSet::getLock):
31+
* heap/Heap.cpp:
32+
(JSC::Heap::Heap):
33+
* heap/Heap.h:
34+
* heap/IsoSubspacePerVM.h:
35+
* heap/MarkedSpace.h:
36+
(JSC::MarkedSpace::directoryLock):
37+
* heap/MarkingConstraintSolver.h:
38+
* heap/SlotVisitor.cpp:
39+
(JSC::SlotVisitor::donateKnownParallel):
40+
* heap/SlotVisitor.h:
41+
* inspector/remote/socket/RemoteInspectorConnectionClient.h:
42+
* inspector/remote/socket/RemoteInspectorSocketEndpoint.h:
43+
* jit/ExecutableAllocator.cpp:
44+
(JSC::ExecutableAllocator::getLock const):
45+
(JSC::dumpJITMemory):
46+
* jit/ExecutableAllocator.h:
47+
(JSC::ExecutableAllocatorBase::getLock const):
48+
* jit/JITWorklist.cpp:
49+
(JSC::JITWorklist::JITWorklist):
50+
* jit/JITWorklist.h:
51+
* jsc.cpp:
52+
* profiler/ProfilerDatabase.h:
53+
* runtime/ConcurrentJSLock.h:
54+
* runtime/DeferredWorkTimer.h:
55+
* runtime/JSLock.h:
56+
* runtime/SamplingProfiler.cpp:
57+
(JSC::FrameWalker::FrameWalker):
58+
(JSC::CFrameWalker::CFrameWalker):
59+
(JSC::SamplingProfiler::takeSample):
60+
* runtime/SamplingProfiler.h:
61+
(JSC::SamplingProfiler::getLock):
62+
* runtime/VM.h:
63+
* runtime/VMTraps.cpp:
64+
(JSC::VMTraps::invalidateCodeBlocksOnStack):
65+
(JSC::VMTraps::VMTraps):
66+
* runtime/VMTraps.h:
67+
* tools/FunctionOverrides.h:
68+
* tools/VMInspector.cpp:
69+
(JSC::ensureIsSafeToLock):
70+
* tools/VMInspector.h:
71+
(JSC::VMInspector::getLock):
72+
* wasm/WasmCalleeRegistry.h:
73+
(JSC::Wasm::CalleeRegistry::getLock):
74+
* wasm/WasmPlan.h:
75+
* wasm/WasmStreamingCompiler.h:
76+
* wasm/WasmThunks.h:
77+
* wasm/WasmWorklist.cpp:
78+
(JSC::Wasm::Worklist::Worklist):
79+
* wasm/WasmWorklist.h:
80+
181
2021-05-23 Chris Dumez <cdumez@apple.com>
282

383
Make CheckedLock the default Lock

‎Source/JavaScriptCore/bytecode/StructureStubInfo.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#include "StructureStubClearingWatchpoint.h"
3939
#include "StubInfoSummary.h"
4040
#include <wtf/Box.h>
41-
#include <wtf/CheckedLock.h>
41+
#include <wtf/Lock.h>
4242

4343
namespace JSC {
4444

@@ -392,7 +392,7 @@ class StructureStubInfo {
392392
bool propertyIsInt32 : 1;
393393
bool propertyIsSymbol : 1;
394394
private:
395-
CheckedLock m_bufferedStructuresLock;
395+
Lock m_bufferedStructuresLock;
396396
};
397397

398398
inline CodeOrigin getStructureStubInfoCodeOrigin(StructureStubInfo& structureStubInfo)

‎Source/JavaScriptCore/bytecode/SuperSampler.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@
2727
#include "SuperSampler.h"
2828

2929
#include "Options.h"
30-
#include <wtf/CheckedLock.h>
3130
#include <wtf/DataLog.h>
31+
#include <wtf/Lock.h>
3232
#include <wtf/Threading.h>
3333

3434
namespace JSC {
3535

3636
volatile uint32_t g_superSamplerCount;
3737
volatile bool g_superSamplerEnabled;
3838

39-
static CheckedLock lock;
39+
static Lock lock;
4040
static double in WTF_GUARDED_BY_LOCK(lock);
4141
static double out WTF_GUARDED_BY_LOCK(lock);
4242

‎Source/JavaScriptCore/dfg/DFGCommonData.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include "InlineCallFrame.h"
3535
#include "JSCJSValueInlines.h"
3636
#include "TrackedReferences.h"
37-
#include <wtf/CheckedLock.h>
37+
#include <wtf/Lock.h>
3838
#include <wtf/NeverDestroyed.h>
3939

4040
namespace JSC { namespace DFG {
@@ -45,7 +45,7 @@ void CommonData::shrinkToFit()
4545
m_jumpReplacements.shrinkToFit();
4646
}
4747

48-
static CheckedLock pcCodeBlockMapLock;
48+
static Lock pcCodeBlockMapLock;
4949
inline HashMap<void*, CodeBlock*>& pcCodeBlockMap() WTF_REQUIRES_LOCK(pcCodeBlockMapLock)
5050
{
5151
static LazyNeverDestroyed<HashMap<void*, CodeBlock*>> pcCodeBlockMap;

‎Source/JavaScriptCore/dfg/DFGPlan.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
#include "Operands.h"
3939
#include "ProfilerCompilation.h"
4040
#include "RecordedStatuses.h"
41-
#include <wtf/CheckedLock.h>
4241
#include <wtf/HashMap.h>
42+
#include <wtf/Lock.h>
4343
#include <wtf/ThreadSafeRefCounted.h>
4444

4545
namespace JSC {
@@ -139,7 +139,7 @@ class Plan : public ThreadSafeRefCounted<Plan> {
139139

140140
Operands<Optional<JSValue>> m_mustHandleValues;
141141
bool m_mustHandleValuesMayIncludeGarbage WTF_GUARDED_BY_LOCK(m_mustHandleValueCleaningLock) { true };
142-
CheckedLock m_mustHandleValueCleaningLock;
142+
Lock m_mustHandleValueCleaningLock;
143143

144144
bool m_willTryToTierUp { false };
145145

‎Source/JavaScriptCore/disassembler/Disassembler.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
#include "Disassembler.h"
2828

2929
#include "MacroAssemblerCodeRef.h"
30-
#include <wtf/CheckedCondition.h>
31-
#include <wtf/CheckedLock.h>
30+
#include <wtf/Condition.h>
3231
#include <wtf/DataLog.h>
3332
#include <wtf/Deque.h>
33+
#include <wtf/Lock.h>
3434
#include <wtf/NeverDestroyed.h>
3535
#include <wtf/Threading.h>
3636

@@ -109,8 +109,8 @@ class AsynchronousDisassembler {
109109
}
110110
}
111111

112-
CheckedLock m_lock;
113-
CheckedCondition m_condition;
112+
Lock m_lock;
113+
Condition m_condition;
114114
Deque<std::unique_ptr<DisassemblyTask>> m_queue WTF_GUARDED_BY_LOCK(m_lock);
115115
bool m_working { false };
116116
};

‎Source/JavaScriptCore/heap/BlockDirectory.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
#include "SubspaceInlines.h"
3232
#include "SuperSampler.h"
3333

34-
#include <wtf/CheckedLock.h>
3534
#include <wtf/FunctionTraits.h>
35+
#include <wtf/Lock.h>
3636
#include <wtf/SimpleStats.h>
3737

3838
namespace JSC {
@@ -346,7 +346,7 @@ RefPtr<SharedTask<MarkedBlock::Handle*()>> BlockDirectory::parallelNotEmptyBlock
346346
private:
347347
BlockDirectory& m_directory WTF_GUARDED_BY_LOCK(m_lock);
348348
size_t m_index WTF_GUARDED_BY_LOCK(m_lock) { 0 };
349-
CheckedLock m_lock;
349+
Lock m_lock;
350350
bool m_done { false };
351351
};
352352

‎Source/JavaScriptCore/heap/Heap.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@
4242
#include "Synchronousness.h"
4343
#include "WeakHandleOwner.h"
4444
#include <wtf/AutomaticThread.h>
45-
#include <wtf/CheckedLock.h>
4645
#include <wtf/ConcurrentPtrHashSet.h>
4746
#include <wtf/Deque.h>
4847
#include <wtf/HashCountedSet.h>
4948
#include <wtf/HashSet.h>
49+
#include <wtf/Lock.h>
5050
#include <wtf/Markable.h>
5151
#include <wtf/ParallelHelperPool.h>
5252
#include <wtf/Threading.h>
@@ -657,7 +657,7 @@ class Heap {
657657
CFinalizerOwner m_cFinalizerOwner;
658658
LambdaFinalizerOwner m_lambdaFinalizerOwner;
659659

660-
CheckedLock m_parallelSlotVisitorLock;
660+
Lock m_parallelSlotVisitorLock;
661661
bool m_isSafeToCollect { false };
662662
bool m_isShuttingDown { false };
663663
bool m_mutatorShouldBeFenced { Options::forceFencedBarrier() };

0 commit comments

Comments
 (0)