[JSC] Avoid allocating heap Function for forEachDebugger

https://bugs.webkit.org/show_bug.cgi?id=244741 Reviewed by Devin Rousso. We should keep NativeExecutable creation cheap. This patch moves VM::forEachDebugger to VMInlines, and avoid allocating heap data structure for Function. * Source/JavaScriptCore/runtime/NativeExecutable.cpp: * Source/JavaScriptCore/runtime/VM.cpp: (JSC::VM::forEachDebugger): Deleted. * Source/JavaScriptCore/runtime/VM.h: * Source/JavaScriptCore/runtime/VMInlines.h: (JSC::VM::forEachDebugger): Canonical link: https://commits.webkit.org/254125@main
WebKit · Sep 3, 2022 · 2d6f6e3 · 2d6f6e3
1 parent 0ac614b
commit 2d6f6e3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/Source/JavaScriptCore/runtime/NativeExecutable.cpp b/Source/JavaScriptCore/runtime/NativeExecutable.cpp
@@ -29,6 +29,7 @@
 #include "Debugger.h"
 #include "ExecutableBaseInlines.h"
 #include "JSCInlines.h"
+#include "VMInlines.h"
 
 namespace JSC {
 

diff --git a/Source/JavaScriptCore/runtime/VM.cpp b/Source/JavaScriptCore/runtime/VM.cpp
@@ -1485,15 +1485,6 @@ void VM::removeDebugger(Debugger& debugger)
     m_debuggers.remove(&debugger);
 }
 
-void VM::forEachDebugger(Function<void(Debugger&)>&& callback)
-{
-    if (LIKELY(m_debuggers.isEmpty()))
-        return;
-
-    for (auto* debugger = m_debuggers.head(); debugger; debugger = debugger->next())
-        callback(*debugger);
-}
-
 void QueuedTask::run()
 {
     if (!m_job.isObject())

diff --git a/Source/JavaScriptCore/runtime/VM.h b/Source/JavaScriptCore/runtime/VM.h
@@ -904,7 +904,8 @@ class VM : public ThreadSafeRefCounted<VM>, public DoublyLinkedListNode<VM> {
 
     void addDebugger(Debugger&);
     void removeDebugger(Debugger&);
-    void forEachDebugger(Function<void(Debugger&)>&&);
+    template<typename Func>
+    void forEachDebugger(const Func&);
 
 private:
     VM(VMType, HeapType, WTF::RunLoop* = nullptr, bool* success = nullptr);

diff --git a/Source/JavaScriptCore/runtime/VMInlines.h b/Source/JavaScriptCore/runtime/VMInlines.h
@@ -25,6 +25,7 @@
 
 #pragma once
 
+#include "Debugger.h"
 #include "EntryFrame.h"
 #include "FuzzerAgent.h"
 #include "ProfilerDatabase.h"
@@ -97,4 +98,14 @@ inline void VM::setFuzzerAgent(std::unique_ptr<FuzzerAgent>&& fuzzerAgent)
     m_fuzzerAgent = WTFMove(fuzzerAgent);
 }
 
+template<typename Func>
+inline void VM::forEachDebugger(const Func& callback)
+{
+    if (LIKELY(m_debuggers.isEmpty()))
+        return;
+
+    for (auto* debugger = m_debuggers.head(); debugger; debugger = debugger->next())
+        callback(*debugger);
+}
+
 } // namespace JSC