diff options
Diffstat (limited to 'src')
29 files changed, 125 insertions, 155 deletions
diff --git a/src/javascript/jsc/bindings/BunClientData.cpp b/src/javascript/jsc/bindings/BunClientData.cpp index 690ee8653..dd12d9e0c 100644 --- a/src/javascript/jsc/bindings/BunClientData.cpp +++ b/src/javascript/jsc/bindings/BunClientData.cpp @@ -66,7 +66,7 @@ void JSVMClientData::create(VM* vm) vm->clientData = clientData; // ~VM deletes this pointer. clientData->m_normalWorld = DOMWrapperWorld::create(*vm, DOMWrapperWorld::Type::Normal); - // vm->heap.addMarkingConstraint(makeUnique<WebCore::DOMGCOutputConstraint>(*vm, clientData->heapData())); + vm->heap.addMarkingConstraint(makeUnique<WebCore::DOMGCOutputConstraint>(*vm, clientData->heapData())); vm->m_typedArrayController = adoptRef(new WebCoreTypedArrayController(true)); } diff --git a/src/javascript/jsc/bindings/BunClientData.h b/src/javascript/jsc/bindings/BunClientData.h index 4b0a36769..1db788f73 100644 --- a/src/javascript/jsc/bindings/BunClientData.h +++ b/src/javascript/jsc/bindings/BunClientData.h @@ -20,9 +20,7 @@ class DOMWrapperWorld; #include "wtf/Function.h" #include "wtf/HashSet.h" #include "wtf/RefPtr.h" -#include "JavaScriptCore/WeakHandleOwner.h" #include "JavaScriptCore/WeakInlines.h" - #include "JavaScriptCore/IsoSubspacePerVM.h" namespace WebCore { diff --git a/src/javascript/jsc/bindings/BunGCOutputConstraint.cpp b/src/javascript/jsc/bindings/BunGCOutputConstraint.cpp index 3954c7acf..169aecad2 100644 --- a/src/javascript/jsc/bindings/BunGCOutputConstraint.cpp +++ b/src/javascript/jsc/bindings/BunGCOutputConstraint.cpp @@ -24,123 +24,121 @@ */ #include "config.h" + +#include "JavaScriptCore/WeakInlines.h" +#include "JavaScriptCore/AbstractSlotVisitorInlines.h" + +#include "JavaScriptCore/VM.h" +#include "JavaScriptCore/MarkingConstraint.h" + +namespace JSC { + +class VisitCounter { +public: + VisitCounter() {} + + VisitCounter(AbstractSlotVisitor& visitor) + : m_visitor(&visitor) + , m_initialVisitCount(visitor.visitCount()) + { + } + + AbstractSlotVisitor& visitor() const { return *m_visitor; } + + size_t visitCount() const + { + return m_visitor->visitCount() - m_initialVisitCount; + } + +private: + AbstractSlotVisitor* m_visitor { nullptr }; + size_t m_initialVisitCount { 0 }; +}; + +static constexpr bool verboseMarkingConstraint = false; + +MarkingConstraint::MarkingConstraint(CString abbreviatedName, CString name, ConstraintVolatility volatility, ConstraintConcurrency concurrency, ConstraintParallelism parallelism) + : m_abbreviatedName(abbreviatedName) + , m_name(WTFMove(name)) + , m_volatility(volatility) + , m_concurrency(concurrency) + , m_parallelism(parallelism) +{ +} + +MarkingConstraint::~MarkingConstraint() +{ +} + +void MarkingConstraint::resetStats() +{ + m_lastVisitCount = 0; +} + +void MarkingConstraint::execute(SlotVisitor& visitor) +{ + ASSERT(!visitor.heap()->isMarkingForGCVerifier()); + VisitCounter visitCounter(visitor); + executeImpl(visitor); + m_lastVisitCount += visitCounter.visitCount(); + if (verboseMarkingConstraint && visitCounter.visitCount()) + dataLog("(", abbreviatedName(), " visited ", visitCounter.visitCount(), " in execute)"); +} + +void MarkingConstraint::executeSynchronously(AbstractSlotVisitor& visitor) +{ + prepareToExecuteImpl(NoLockingNecessary, visitor); + executeImpl(visitor); +} + +double MarkingConstraint::quickWorkEstimate(SlotVisitor&) +{ + return 0; +} + +double MarkingConstraint::workEstimate(SlotVisitor& visitor) +{ + return lastVisitCount() + quickWorkEstimate(visitor); +} + +void MarkingConstraint::prepareToExecute(const AbstractLocker& constraintSolvingLocker, SlotVisitor& visitor) +{ + ASSERT(!visitor.heap()->isMarkingForGCVerifier()); + dataLogIf(Options::logGC(), abbreviatedName()); + VisitCounter visitCounter(visitor); + prepareToExecuteImpl(constraintSolvingLocker, visitor); + m_lastVisitCount = visitCounter.visitCount(); + if (verboseMarkingConstraint && visitCounter.visitCount()) + dataLog("(", abbreviatedName(), " visited ", visitCounter.visitCount(), " in prepareToExecute)"); +} + +void MarkingConstraint::doParallelWork(SlotVisitor& visitor, SharedTask<void(SlotVisitor&)>& task) +{ + ASSERT(!visitor.heap()->isMarkingForGCVerifier()); + VisitCounter visitCounter(visitor); + task.run(visitor); + if (verboseMarkingConstraint && visitCounter.visitCount()) + dataLog("(", abbreviatedName(), " visited ", visitCounter.visitCount(), " in doParallelWork)"); + { + Locker locker { m_lock }; + m_lastVisitCount += visitCounter.visitCount(); + } +} + +void MarkingConstraint::prepareToExecuteImpl(const AbstractLocker&, AbstractSlotVisitor&) +{ +} + +} // namespace JSC + #include "BunGCOutputConstraint.h" -#include "JavaScriptCore/JSCInlines.h" #include "WebCoreJSClientData.h" #include "JavaScriptCore/BlockDirectoryInlines.h" #include "JavaScriptCore/HeapInlines.h" #include "JavaScriptCore/MarkedBlockInlines.h" #include "JavaScriptCore/SubspaceInlines.h" -// #include "JavaScriptCore/WeakInlines.h" -// #include "JavaScriptCore/AbstractSlotVisitorInlines.h" - -// #include "JavaScriptCore/VM.h" -// #include "JavaScriptCore/MarkingConstraint.h" - -// #include "JavaScriptCore/JSCInlines.h" - -// namespace JSC { - -// class VisitCounter { -// public: -// VisitCounter() {} - -// VisitCounter(AbstractSlotVisitor& visitor) -// : m_visitor(&visitor) -// , m_initialVisitCount(visitor.visitCount()) -// { -// } - -// AbstractSlotVisitor& visitor() const { return *m_visitor; } - -// size_t visitCount() const -// { -// return m_visitor->visitCount() - m_initialVisitCount; -// } - -// private: -// AbstractSlotVisitor* m_visitor { nullptr }; -// size_t m_initialVisitCount { 0 }; -// }; - -// static constexpr bool verboseMarkingConstraint = false; - -// MarkingConstraint::MarkingConstraint(CString abbreviatedName, CString name, ConstraintVolatility volatility, ConstraintConcurrency concurrency, ConstraintParallelism parallelism) -// : m_abbreviatedName(abbreviatedName) -// , m_name(WTFMove(name)) -// , m_volatility(volatility) -// , m_concurrency(concurrency) -// , m_parallelism(parallelism) -// { -// } - -// MarkingConstraint::~MarkingConstraint() -// { -// } - -// void MarkingConstraint::resetStats() -// { -// m_lastVisitCount = 0; -// } - -// void MarkingConstraint::execute(SlotVisitor& visitor) -// { -// ASSERT(!visitor.heap()->isMarkingForGCVerifier()); -// VisitCounter visitCounter(visitor); -// executeImpl(visitor); -// m_lastVisitCount += visitCounter.visitCount(); -// if (verboseMarkingConstraint && visitCounter.visitCount()) -// dataLog("(", abbreviatedName(), " visited ", visitCounter.visitCount(), " in execute)"); -// } - -// void MarkingConstraint::executeSynchronously(AbstractSlotVisitor& visitor) -// { -// prepareToExecuteImpl(NoLockingNecessary, visitor); -// executeImpl(visitor); -// } - -// double MarkingConstraint::quickWorkEstimate(SlotVisitor&) -// { -// return 0; -// } - -// double MarkingConstraint::workEstimate(SlotVisitor& visitor) -// { -// return lastVisitCount() + quickWorkEstimate(visitor); -// } - -// void MarkingConstraint::prepareToExecute(const AbstractLocker& constraintSolvingLocker, SlotVisitor& visitor) -// { -// ASSERT(!visitor.heap()->isMarkingForGCVerifier()); -// dataLogIf(Options::logGC(), abbreviatedName()); -// VisitCounter visitCounter(visitor); -// prepareToExecuteImpl(constraintSolvingLocker, visitor); -// m_lastVisitCount = visitCounter.visitCount(); -// if (verboseMarkingConstraint && visitCounter.visitCount()) -// dataLog("(", abbreviatedName(), " visited ", visitCounter.visitCount(), " in prepareToExecute)"); -// } - -// void MarkingConstraint::doParallelWork(SlotVisitor& visitor, SharedTask<void(SlotVisitor&)>& task) -// { -// ASSERT(!visitor.heap()->isMarkingForGCVerifier()); -// VisitCounter visitCounter(visitor); -// task.run(visitor); -// if (verboseMarkingConstraint && visitCounter.visitCount()) -// dataLog("(", abbreviatedName(), " visited ", visitCounter.visitCount(), " in doParallelWork)"); -// { -// Locker locker { m_lock }; -// m_lastVisitCount += visitCounter.visitCount(); -// } -// } - -// void MarkingConstraint::prepareToExecuteImpl(const AbstractLocker&, AbstractSlotVisitor&) -// { -// } - -// } // namespace JSC - namespace WebCore { using namespace JSC; diff --git a/src/javascript/jsc/bindings/BunStream.cpp b/src/javascript/jsc/bindings/BunStream.cpp index 13f330ed0..ee9dd3f50 100644 --- a/src/javascript/jsc/bindings/BunStream.cpp +++ b/src/javascript/jsc/bindings/BunStream.cpp @@ -2,8 +2,6 @@ #include "JavaScriptCore/JSMicrotask.h" #include "JavaScriptCore/ObjectConstructor.h" -#include "JavaScriptCore/JSCInlines.h" - namespace WebCore { using JSGlobalObject = JSC::JSGlobalObject; using Exception = JSC::Exception; diff --git a/src/javascript/jsc/bindings/DOMWrapperWorld-class.h b/src/javascript/jsc/bindings/DOMWrapperWorld-class.h index 0c33f37ef..d2d4fb00c 100644 --- a/src/javascript/jsc/bindings/DOMWrapperWorld-class.h +++ b/src/javascript/jsc/bindings/DOMWrapperWorld-class.h @@ -2,8 +2,6 @@ #include "root.h" -#include "JavaScriptCore/JSCInlines.h" - #include "wtf/Forward.h" namespace WebCore { diff --git a/src/javascript/jsc/bindings/GCDefferalContext.h b/src/javascript/jsc/bindings/GCDefferalContext.h index 994b16837..7bedfb3e0 100644 --- a/src/javascript/jsc/bindings/GCDefferalContext.h +++ b/src/javascript/jsc/bindings/GCDefferalContext.h @@ -2,8 +2,6 @@ #include "helpers.h" -#include "JavaScriptCore/JSCInlines.h" - namespace JSC { ALWAYS_INLINE GCDeferralContext::GCDeferralContext(VM& vm) diff --git a/src/javascript/jsc/bindings/JSDOMBinding.h b/src/javascript/jsc/bindings/JSDOMBinding.h index dc2096f2b..607eafa78 100644 --- a/src/javascript/jsc/bindings/JSDOMBinding.h +++ b/src/javascript/jsc/bindings/JSDOMBinding.h @@ -18,4 +18,3 @@ #include "wtf/GetPtr.h" #include "wtf/Vector.h" #include <cstddef> -#include "JavaScriptCore/WeakHandleOwner.h"
\ No newline at end of file diff --git a/src/javascript/jsc/bindings/JSDOMExceptionHandling.h b/src/javascript/jsc/bindings/JSDOMExceptionHandling.h index bc95053e7..a130dfcde 100644 --- a/src/javascript/jsc/bindings/JSDOMExceptionHandling.h +++ b/src/javascript/jsc/bindings/JSDOMExceptionHandling.h @@ -25,8 +25,6 @@ #include "root.h" -#include "JavaScriptCore/WeakHandleOwner.h" - #include "ExceptionDetails.h" #include "ExceptionOr.h" #include "JavaScriptCore/ThrowScope.h" diff --git a/src/javascript/jsc/bindings/JSDOMWrapperCache.cpp b/src/javascript/jsc/bindings/JSDOMWrapperCache.cpp index 305396b4a..662462bac 100644 --- a/src/javascript/jsc/bindings/JSDOMWrapperCache.cpp +++ b/src/javascript/jsc/bindings/JSDOMWrapperCache.cpp @@ -23,8 +23,6 @@ #include "JSDOMWrapperCache.h" -#include "JavaScriptCore/JSCInlines.h" - namespace WebCore { using namespace JSC; diff --git a/src/javascript/jsc/bindings/Path.cpp b/src/javascript/jsc/bindings/Path.cpp index 7e5c51e92..ed155141c 100644 --- a/src/javascript/jsc/bindings/Path.cpp +++ b/src/javascript/jsc/bindings/Path.cpp @@ -3,8 +3,6 @@ #include "BunClientData.h" -#include "JavaScriptCore/JSCInlines.h" - #include "JavaScriptCore/JSFunction.h" #include "JavaScriptCore/JSMicrotask.h" #include "JavaScriptCore/ObjectConstructor.h" diff --git a/src/javascript/jsc/bindings/Process.cpp b/src/javascript/jsc/bindings/Process.cpp index fa0f37efc..52e5909ec 100644 --- a/src/javascript/jsc/bindings/Process.cpp +++ b/src/javascript/jsc/bindings/Process.cpp @@ -2,8 +2,6 @@ #include "JavaScriptCore/JSMicrotask.h" #include "JavaScriptCore/ObjectConstructor.h" -#include "JavaScriptCore/JSCInlines.h" - #pragma mark - Node.js Process namespace Zig { diff --git a/src/javascript/jsc/bindings/ZigConsoleClient.cpp b/src/javascript/jsc/bindings/ZigConsoleClient.cpp index 9c025f078..e3556ee0b 100644 --- a/src/javascript/jsc/bindings/ZigConsoleClient.cpp +++ b/src/javascript/jsc/bindings/ZigConsoleClient.cpp @@ -8,7 +8,6 @@ #include "wtf/text/WTFString.h" #include "GCDefferalContext.h" -#include "JavaScriptCore/JSCInlines.h" using ScriptArguments = Inspector::ScriptArguments; using MessageType = JSC::MessageType; diff --git a/src/javascript/jsc/bindings/ZigGlobalObject.cpp b/src/javascript/jsc/bindings/ZigGlobalObject.cpp index 509f6d2fc..8d005a981 100644 --- a/src/javascript/jsc/bindings/ZigGlobalObject.cpp +++ b/src/javascript/jsc/bindings/ZigGlobalObject.cpp @@ -22,7 +22,7 @@ #include "JavaScriptCore/InitializeThreading.h" #include "JavaScriptCore/IteratorOperations.h" #include "JavaScriptCore/JSArray.h" -#include "JavaScriptCore/JSCInlines.h" + #include "JavaScriptCore/JSCallbackConstructor.h" #include "JavaScriptCore/JSCallbackObject.h" #include "JavaScriptCore/JSCast.h" @@ -109,7 +109,6 @@ extern "C" void JSCInitialize() has_loaded_jsc = true; JSC::Config::enableRestrictedOptions(); - // JSC::Options::useAtMethod() = true; std::set_terminate([]() { Zig__GlobalObject__onCrash(); }); WTF::initializeMainThread(); JSC::initialize(); @@ -136,12 +135,12 @@ extern "C" JSC__JSGlobalObject* Zig__GlobalObject__create(JSClassRef* globalObje auto heapSize = JSC::HeapType::Large; JSC::VM& vm = JSC::VM::create(heapSize).leakRef(); + JSC::Wasm::enableFastMemory(); - WebCore::JSVMClientData::create(&vm); - + // This must happen before JSVMClientData::create vm.heap.acquireAccess(); - JSC::Wasm::enableFastMemory(); + WebCore::JSVMClientData::create(&vm); JSC::JSLockHolder locker(vm); Zig::GlobalObject* globalObject = Zig::GlobalObject::create(vm, Zig::GlobalObject::createStructure(vm, JSC::JSGlobalObject::create(vm, JSC::JSGlobalObject::createStructure(vm, JSC::jsNull())), JSC::jsNull())); @@ -152,6 +151,7 @@ extern "C" JSC__JSGlobalObject* Zig__GlobalObject__create(JSClassRef* globalObje } JSC::gcProtect(globalObject); + vm.ref(); return globalObject; } diff --git a/src/javascript/jsc/bindings/bindings.cpp b/src/javascript/jsc/bindings/bindings.cpp index a55e5715d..a6fd5c95f 100644 --- a/src/javascript/jsc/bindings/bindings.cpp +++ b/src/javascript/jsc/bindings/bindings.cpp @@ -18,7 +18,7 @@ #include "JavaScriptCore/JSArray.h" #include "JavaScriptCore/JSArrayBuffer.h" #include "JavaScriptCore/JSArrayInlines.h" -#include "JavaScriptCore/JSCInlines.h" + #include "JavaScriptCore/JSCallbackObject.h" #include "JavaScriptCore/JSClassRef.h" #include "JavaScriptCore/JSInternalPromise.h" @@ -2409,7 +2409,7 @@ void JSC__JSValue__getNameProperty(JSC__JSValue JSValue0, JSC__JSGlobalObject* a { JSC::JSObject* obj = JSC::JSValue::decode(JSValue0).getObject(); - JSC::VM &vm = arg1->vm(); + JSC::VM& vm = arg1->vm(); if (obj == nullptr) { arg2->len = 0; @@ -2417,10 +2417,9 @@ void JSC__JSValue__getNameProperty(JSC__JSValue JSValue0, JSC__JSGlobalObject* a } JSC::JSValue name = obj->getDirect(vm, vm.propertyNames->toStringTagSymbol); - if (name == JSC::JSValue{}) { + if (name == JSC::JSValue {}) { name = obj->getDirect(vm, vm.propertyNames->name); } - if (name && name.isString()) { auto str = name.toWTFString(arg1); diff --git a/src/javascript/jsc/bindings/headers-cpp.h b/src/javascript/jsc/bindings/headers-cpp.h index fa70542cd..6970e8912 100644 --- a/src/javascript/jsc/bindings/headers-cpp.h +++ b/src/javascript/jsc/bindings/headers-cpp.h @@ -1,4 +1,4 @@ -//-- AUTOGENERATED FILE -- 1648857986 +//-- AUTOGENERATED FILE -- 1649320745 // clang-format off #pragma once diff --git a/src/javascript/jsc/bindings/headers.h b/src/javascript/jsc/bindings/headers.h index a3a12d138..dd4ae22aa 100644 --- a/src/javascript/jsc/bindings/headers.h +++ b/src/javascript/jsc/bindings/headers.h @@ -1,5 +1,5 @@ // clang-format: off -//-- AUTOGENERATED FILE -- 1648857986 +//-- AUTOGENERATED FILE -- 1649320745 #pragma once #include <stddef.h> diff --git a/src/javascript/jsc/bindings/objects.h b/src/javascript/jsc/bindings/objects.h index dc3030622..622a46804 100644 --- a/src/javascript/jsc/bindings/objects.h +++ b/src/javascript/jsc/bindings/objects.h @@ -4,7 +4,7 @@ // #include "headers.h" // #include "JavaScriptCore/JSObject.h" -// #include "JavaScriptCore/JSCInlines.h" +// // #include "JavaScriptCore/InternalFunction.h" // namespace Zig { diff --git a/src/javascript/jsc/bindings/webcore/DOMConstructors.h b/src/javascript/jsc/bindings/webcore/DOMConstructors.h index 3d6833e7a..c58be6584 100644 --- a/src/javascript/jsc/bindings/webcore/DOMConstructors.h +++ b/src/javascript/jsc/bindings/webcore/DOMConstructors.h @@ -1,4 +1,4 @@ -#include "JavaScriptCore/JSCInlines.h" + #include "wtf/FastMalloc.h" #include "wtf/Noncopyable.h" diff --git a/src/javascript/jsc/bindings/webcore/JSAbortController.cpp b/src/javascript/jsc/bindings/webcore/JSAbortController.cpp index 3a9744b40..afd63ff5d 100644 --- a/src/javascript/jsc/bindings/webcore/JSAbortController.cpp +++ b/src/javascript/jsc/bindings/webcore/JSAbortController.cpp @@ -41,7 +41,7 @@ #include "WebCoreJSClientData.h" #include "JavaScriptCore/FunctionPrototype.h" #include "JavaScriptCore/HeapAnalyzer.h" -#include "JavaScriptCore/JSCInlines.h" + #include "JavaScriptCore/JSDestructibleObjectHeapCellType.h" #include "JavaScriptCore/SlotVisitorMacros.h" #include "JavaScriptCore/SubspaceInlines.h" diff --git a/src/javascript/jsc/bindings/webcore/JSAbortSignalCustom.cpp b/src/javascript/jsc/bindings/webcore/JSAbortSignalCustom.cpp index 7aac447e2..bc3bab081 100644 --- a/src/javascript/jsc/bindings/webcore/JSAbortSignalCustom.cpp +++ b/src/javascript/jsc/bindings/webcore/JSAbortSignalCustom.cpp @@ -28,8 +28,6 @@ #include "wtf/NeverDestroyed.h" #include "JSAbortSignal.h" -#include "JavaScriptCore/WeakHandleOwner.h" - namespace WebCore { bool JSAbortSignalOwner::isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown> handle, void*, JSC::AbstractSlotVisitor& visitor, const char** reason) diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConstructorBase.cpp b/src/javascript/jsc/bindings/webcore/JSDOMConstructorBase.cpp index 90170e910..76e5bed57 100644 --- a/src/javascript/jsc/bindings/webcore/JSDOMConstructorBase.cpp +++ b/src/javascript/jsc/bindings/webcore/JSDOMConstructorBase.cpp @@ -22,7 +22,6 @@ #include "config.h" #include "JSDOMConstructor.h" -#include "JavaScriptCore/JSCInlines.h" #include "WebCoreJSClientData.h" namespace WebCore { diff --git a/src/javascript/jsc/bindings/webcore/JSDOMConvertWebGL.cpp b/src/javascript/jsc/bindings/webcore/JSDOMConvertWebGL.cpp index e2f6db743..7d4576661 100644 --- a/src/javascript/jsc/bindings/webcore/JSDOMConvertWebGL.cpp +++ b/src/javascript/jsc/bindings/webcore/JSDOMConvertWebGL.cpp @@ -71,7 +71,6 @@ #include "JSWebGLTransformFeedback.h" #include "JSWebGLVertexArrayObject.h" #include "JSWebGLVertexArrayObjectOES.h" -#include "JavaScriptCore/JSCInlines.h" namespace WebCore { using namespace JSC; diff --git a/src/javascript/jsc/bindings/webcore/JSDOMException.cpp b/src/javascript/jsc/bindings/webcore/JSDOMException.cpp index 4a075205f..bf8bcd9f9 100644 --- a/src/javascript/jsc/bindings/webcore/JSDOMException.cpp +++ b/src/javascript/jsc/bindings/webcore/JSDOMException.cpp @@ -38,7 +38,7 @@ #include "WebCoreJSClientData.h" #include "JavaScriptCore/FunctionPrototype.h" #include "JavaScriptCore/HeapAnalyzer.h" -#include "JavaScriptCore/JSCInlines.h" + #include "JavaScriptCore/JSDestructibleObjectHeapCellType.h" #include "JavaScriptCore/SlotVisitorMacros.h" #include "JavaScriptCore/SubspaceInlines.h" diff --git a/src/javascript/jsc/bindings/webcore/JSDOMException.h b/src/javascript/jsc/bindings/webcore/JSDOMException.h index 0d09fdd23..7c20a5745 100644 --- a/src/javascript/jsc/bindings/webcore/JSDOMException.h +++ b/src/javascript/jsc/bindings/webcore/JSDOMException.h @@ -27,8 +27,6 @@ #include "JavaScriptCore/ErrorPrototype.h" #include "wtf/NeverDestroyed.h" -#include "JavaScriptCore/WeakHandleOwner.h" - namespace WebCore { class JSDOMException : public JSDOMWrapper<DOMException> { diff --git a/src/javascript/jsc/bindings/webcore/JSDOMURL.cpp b/src/javascript/jsc/bindings/webcore/JSDOMURL.cpp index b7efa19ae..898622279 100644 --- a/src/javascript/jsc/bindings/webcore/JSDOMURL.cpp +++ b/src/javascript/jsc/bindings/webcore/JSDOMURL.cpp @@ -43,7 +43,7 @@ #include "WebCoreJSClientData.h" #include "JavaScriptCore/FunctionPrototype.h" #include "JavaScriptCore/HeapAnalyzer.h" -#include "JavaScriptCore/JSCInlines.h" + #include "JavaScriptCore/JSDestructibleObjectHeapCellType.h" #include "JavaScriptCore/SlotVisitorMacros.h" #include "JavaScriptCore/SubspaceInlines.h" diff --git a/src/javascript/jsc/bindings/webcore/JSURLSearchParams.cpp b/src/javascript/jsc/bindings/webcore/JSURLSearchParams.cpp index 92311cf49..29aea6d1b 100644 --- a/src/javascript/jsc/bindings/webcore/JSURLSearchParams.cpp +++ b/src/javascript/jsc/bindings/webcore/JSURLSearchParams.cpp @@ -45,7 +45,7 @@ #include "JavaScriptCore/FunctionPrototype.h" #include "JavaScriptCore/HeapAnalyzer.h" #include "JavaScriptCore/JSArray.h" -#include "JavaScriptCore/JSCInlines.h" + #include "JavaScriptCore/JSDestructibleObjectHeapCellType.h" #include "JavaScriptCore/SlotVisitorMacros.h" #include "JavaScriptCore/SubspaceInlines.h" diff --git a/src/javascript/jsc/bindings/webcore/ScriptWrappable.h b/src/javascript/jsc/bindings/webcore/ScriptWrappable.h index ac6fd7649..20aafa6a1 100644 --- a/src/javascript/jsc/bindings/webcore/ScriptWrappable.h +++ b/src/javascript/jsc/bindings/webcore/ScriptWrappable.h @@ -32,7 +32,7 @@ #pragma once #include "root.h" -#include "JavaScriptCore/JSCInlines.h" + #include "JSDOMWrapper.h" // #include "wtf/IsoMalloc.h" diff --git a/src/javascript/jsc/bindings/webcore/WebCoreTypedArrayController.cpp b/src/javascript/jsc/bindings/webcore/WebCoreTypedArrayController.cpp index d0ac19064..f95b5f194 100644 --- a/src/javascript/jsc/bindings/webcore/WebCoreTypedArrayController.cpp +++ b/src/javascript/jsc/bindings/webcore/WebCoreTypedArrayController.cpp @@ -25,8 +25,6 @@ #include "root.h" -#include "JavaScriptCore/JSCInlines.h" - #include "WebCoreTypedArrayController.h" #include "JSDOMConvertBufferSource.h" diff --git a/src/javascript/jsc/bindings/webcore/weak_handle.h b/src/javascript/jsc/bindings/webcore/weak_handle.h index 201b0696b..2a0f8b5f8 100644 --- a/src/javascript/jsc/bindings/webcore/weak_handle.h +++ b/src/javascript/jsc/bindings/webcore/weak_handle.h @@ -1,7 +1,6 @@ #pragma once #include "config.h" -#include "JavaScriptCore/WeakHandleOwner.h" namespace JSC { |