[JSC] Clean up WasmToJS #8944

Constellation · 2023-01-22T09:05:59Z

`db4b9bc`

[JSC] Clean up WasmToJS
https://bugs.webkit.org/show_bug.cgi?id=250966
rdar://104523769

Reviewed by Tadeu Zagallo.

This patch fixes terrible hack in WasmToJS where we are setting JSWebAssemblyInstance to |callee| slot.

1. We should use Wasm::Callee since this is wasm code. This patch adds WasmToJSCallee and materialize this.
   We also puts Wasm::Instance* in |codeBlock| slot too so that operation function from this code can get
   Wasm::Instance*.
2. Remove indirection of types of owners. We should tightly couple JSC with wasm engine.
3. Put JSGlobalObject* in Wasm::Instance* to make WasmToJS code simpler and efficient.
4. Remove CallFrame::isAnyWasmCallee. Now all Wasm frames have Wasm::Callee*. So this hack is no longer necessary.

* JSTests/stress/sampling-profiler-wasm-name-section.js:
(platformSupportsSamplingProfiler.vm.isWasmSupported):
* Source/JavaScriptCore/bytecode/CodeBlock.cpp:
(JSC::CodeBlock::noticeIncomingCall):
* Source/JavaScriptCore/bytecode/Repatch.cpp:
(JSC::linkMonomorphicCall):
(JSC::linkVirtualFor):
(JSC::linkPolymorphicCall):
* Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp:
(JSC::DebuggerCallFrame::scope):
(JSC::DebuggerCallFrame::thisValue const):
(JSC::DebuggerCallFrame::evaluateWithScopeExtension):
(JSC::DebuggerCallFrame::sourceIDForCallFrame):
* Source/JavaScriptCore/dfg/DFGDoesGCCheck.cpp:
(JSC::DFG::DoesGCCheck::verifyCanGC):
* Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp:
(Inspector::functionName):
* Source/JavaScriptCore/interpreter/CallFrame.cpp:
(JSC::CallFrame::friendlyFunctionName):
(JSC::CallFrame::dump const):
(JSC::CallFrame::lexicalGlobalObjectFromWasmCallee const):
(JSC::CallFrame::isAnyWasmCallee const): Deleted.
* Source/JavaScriptCore/interpreter/CallFrame.h:
* Source/JavaScriptCore/interpreter/Interpreter.cpp:
(JSC::UnwindFunctor::notifyDebuggerOfUnwinding):
(JSC::Interpreter::unwind):
* Source/JavaScriptCore/interpreter/ShadowChicken.cpp:
(JSC::ShadowChicken::update):
* Source/JavaScriptCore/interpreter/StackVisitor.cpp:
(JSC::StackVisitor::readFrame):
(JSC::StackVisitor::readNonInlinedFrame):
(JSC::StackVisitor::Frame::calleeSaveRegistersForUnwinding):
* Source/JavaScriptCore/jit/JITExceptions.cpp:
(JSC::genericUnwind):
* Source/JavaScriptCore/jit/PolymorphicCallStubRoutine.cpp:
(JSC::PolymorphicCallStubRoutine::PolymorphicCallStubRoutine):
* Source/JavaScriptCore/jsc.cpp:
(JSC_DEFINE_HOST_FUNCTION):
* Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp:
(JSC::getCallerCodeBlock):
* Source/JavaScriptCore/runtime/VM.cpp:
(JSC::VM::throwException):
* Source/JavaScriptCore/runtime/VMTraps.cpp:
(JSC::VMTraps::invalidateCodeBlocksOnStack):
* Source/JavaScriptCore/tools/VMInspector.cpp:
(JSC::VMInspector::dumpRegisters):
* Source/JavaScriptCore/wasm/WasmCallee.cpp:
(JSC::Wasm::Callee::runWithDowncast):
(JSC::Wasm::WasmToJSCallee::WasmToJSCallee):
* Source/JavaScriptCore/wasm/WasmCallee.h:
* Source/JavaScriptCore/wasm/WasmCompilationMode.cpp:
(JSC::Wasm::makeString):
* Source/JavaScriptCore/wasm/WasmCompilationMode.h:
(JSC::Wasm::isOSREntry):
(JSC::Wasm::isAnyBBQ):
(JSC::Wasm::isAnyOMG):
* Source/JavaScriptCore/wasm/WasmGlobal.cpp:
* Source/JavaScriptCore/wasm/WasmGlobal.h:
* Source/JavaScriptCore/wasm/WasmInstance.cpp:
(JSC::Wasm::Instance::Instance):
(JSC::Wasm::Instance::create):
(JSC::Wasm::Instance::setGlobal):
(JSC::Wasm::Instance::setFunctionWrapper):
(JSC::Wasm::Instance::initElementSegment):
* Source/JavaScriptCore/wasm/WasmInstance.h:
(JSC::Wasm::Instance::setOwner):
(JSC::Wasm::Instance::owner const):
(JSC::Wasm::Instance::offsetOfGlobalObject):
(JSC::Wasm::Instance::globalObject const):
(JSC::Wasm::Instance::allocationSize):
* Source/JavaScriptCore/wasm/WasmModule.cpp:
(JSC::Wasm::Module::Module):
* Source/JavaScriptCore/wasm/WasmModule.h:
(JSC::Wasm::Module::wasmToJSCallee):
* Source/JavaScriptCore/wasm/WasmOperations.cpp:
(JSC::Wasm::JSC_DEFINE_JIT_OPERATION):
* Source/JavaScriptCore/wasm/WasmOperations.h:
* Source/JavaScriptCore/wasm/WasmOperationsInlines.h:
(JSC::Wasm::arrayNew):
(JSC::Wasm::structNew):
(JSC::Wasm::structSet):
(JSC::Wasm::throwWasmToJSException):
* Source/JavaScriptCore/wasm/WasmSlowPaths.cpp:
(JSC::LLInt::WASM_SLOW_PATH_DECL):
* Source/JavaScriptCore/wasm/WasmTable.cpp:
* Source/JavaScriptCore/wasm/WasmTable.h:
(JSC::Wasm::Table::owner const):
(JSC::Wasm::Table::setOwner):
* Source/JavaScriptCore/wasm/js/JSWebAssemblyInstance.cpp:
(JSC::JSWebAssemblyInstance::visitChildrenImpl):
(JSC::JSWebAssemblyInstance::tryCreate):
* Source/JavaScriptCore/wasm/js/JSWebAssemblyInstance.h:
* Source/JavaScriptCore/wasm/js/JSWebAssemblyModule.cpp:
(JSC::JSWebAssemblyModule::generateWasmToJSStubs):
* Source/JavaScriptCore/wasm/js/WasmToJS.cpp:
(JSC::Wasm::handleBadImportTypeUse):
(JSC::Wasm::wasmToJS):
* Source/JavaScriptCore/wasm/js/WasmToJS.h:
* Source/JavaScriptCore/wasm/js/WebAssemblyModuleRecord.cpp:
(JSC::WebAssemblyModuleRecord::initializeExports):

Canonical link: https://commits.webkit.org/259216@main

327ecd4

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 🧪 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🛠 gtk	✅ 🛠 wincairo
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 gtk-wk2
	✅ 🧪 api-ios	✅ 🧪 mac-wk1	✅ 🧪 api-gtk
✅ 🛠 🧪 jsc	✅ 🛠 tv	✅ 🧪 mac-wk2	✅ 🛠 jsc-armv7
✅ 🛠 🧪 jsc-arm64	✅ 🛠 tv-sim	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 jsc-armv7-tests
	✅ 🛠 watch	✅ 🧪 mac-wk2-stress	✅ 🛠 jsc-mips
✅ 🛠 🧪 merge	✅ 🛠 watch-sim		✅ 🧪 jsc-mips-tests

webkit-early-warning-system · 2023-01-22T09:06:20Z

EWS run on previous version of this PR (hash 1ca9f65)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	~~🛠 🧪 win~~
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🛠 gtk	❌ 🛠 wincairo
✅ 🧪 webkitperl	~~🧪 ios-wk2~~	~~🧪 api-mac~~	~~🧪 gtk-wk2~~
	~~🧪 api-ios~~	~~🧪 mac-wk1~~	~~🧪 api-gtk~~
✅ 🛠 🧪 jsc	✅ 🛠 tv	~~🧪 mac-wk2~~	✅ 🛠 jsc-armv7
✅ 🛠 🧪 jsc-arm64	✅ 🛠 tv-sim	~~🧪 mac-AS-debug-wk2~~	~~🧪 jsc-armv7-tests~~
	❌ 🛠 watch	~~🧪 mac-wk2-stress~~	❌ 🛠 jsc-mips
	✅ 🛠 watch-sim		❌ 🧪 jsc-mips-tests

webkit-early-warning-system · 2023-01-22T09:15:43Z

EWS run on previous version of this PR (hash 0abedce)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	~~🛠 🧪 win~~
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🛠 gtk	❌ 🛠 wincairo
✅ 🧪 webkitperl	~~🧪 ios-wk2~~	~~🧪 api-mac~~	~~🧪 gtk-wk2~~
	~~🧪 api-ios~~	~~🧪 mac-wk1~~	~~🧪 api-gtk~~
⏳ 🛠 🧪 jsc	✅ 🛠 tv	~~🧪 mac-wk2~~	✅ 🛠 jsc-armv7
✅ 🛠 🧪 jsc-arm64	✅ 🛠 tv-sim	~~🧪 mac-AS-debug-wk2~~	~~🧪 jsc-armv7-tests~~
	❌ 🛠 watch	~~🧪 mac-wk2-stress~~	❌ 🛠 jsc-mips
	✅ 🛠 watch-sim		❌ 🧪 jsc-mips-tests

webkit-early-warning-system · 2023-01-22T09:26:49Z

EWS run on previous version of this PR (hash b61ea5b)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 🧪 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🛠 gtk	✅ 🛠 wincairo
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	~~🧪 gtk-wk2~~
	✅ 🧪 api-ios	✅ 🧪 mac-wk1	✅ 🧪 api-gtk
✅ 🛠 🧪 jsc	✅ 🛠 tv	✅ 🧪 mac-wk2	✅ 🛠 jsc-armv7
✅ 🛠 🧪 jsc-arm64	✅ 🛠 tv-sim	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 jsc-armv7-tests
	✅ 🛠 watch	✅ 🧪 mac-wk2-stress	✅ 🛠 jsc-mips
	✅ 🛠 watch-sim		✅ 🧪 jsc-mips-tests

webkit-early-warning-system · 2023-01-22T11:16:18Z

EWS run on current version of this PR (hash 327ecd4)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 🧪 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🛠 gtk	✅ 🛠 wincairo
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 gtk-wk2
	✅ 🧪 api-ios	✅ 🧪 mac-wk1	✅ 🧪 api-gtk
✅ 🛠 🧪 jsc	✅ 🛠 tv	✅ 🧪 mac-wk2	✅ 🛠 jsc-armv7
✅ 🛠 🧪 jsc-arm64	✅ 🛠 tv-sim	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 jsc-armv7-tests
	✅ 🛠 watch	✅ 🧪 mac-wk2-stress	✅ 🛠 jsc-mips
✅ 🛠 🧪 merge	✅ 🛠 watch-sim		✅ 🧪 jsc-mips-tests

tadeuzagallo

This is great, so much better!

https://bugs.webkit.org/show_bug.cgi?id=250966 rdar://104523769 Reviewed by Tadeu Zagallo. This patch fixes terrible hack in WasmToJS where we are setting JSWebAssemblyInstance to |callee| slot. 1. We should use Wasm::Callee since this is wasm code. This patch adds WasmToJSCallee and materialize this. We also puts Wasm::Instance* in |codeBlock| slot too so that operation function from this code can get Wasm::Instance*. 2. Remove indirection of types of owners. We should tightly couple JSC with wasm engine. 3. Put JSGlobalObject* in Wasm::Instance* to make WasmToJS code simpler and efficient. 4. Remove CallFrame::isAnyWasmCallee. Now all Wasm frames have Wasm::Callee*. So this hack is no longer necessary. * JSTests/stress/sampling-profiler-wasm-name-section.js: (platformSupportsSamplingProfiler.vm.isWasmSupported): * Source/JavaScriptCore/bytecode/CodeBlock.cpp: (JSC::CodeBlock::noticeIncomingCall): * Source/JavaScriptCore/bytecode/Repatch.cpp: (JSC::linkMonomorphicCall): (JSC::linkVirtualFor): (JSC::linkPolymorphicCall): * Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp: (JSC::DebuggerCallFrame::scope): (JSC::DebuggerCallFrame::thisValue const): (JSC::DebuggerCallFrame::evaluateWithScopeExtension): (JSC::DebuggerCallFrame::sourceIDForCallFrame): * Source/JavaScriptCore/dfg/DFGDoesGCCheck.cpp: (JSC::DFG::DoesGCCheck::verifyCanGC): * Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp: (Inspector::functionName): * Source/JavaScriptCore/interpreter/CallFrame.cpp: (JSC::CallFrame::friendlyFunctionName): (JSC::CallFrame::dump const): (JSC::CallFrame::lexicalGlobalObjectFromWasmCallee const): (JSC::CallFrame::isAnyWasmCallee const): Deleted. * Source/JavaScriptCore/interpreter/CallFrame.h: * Source/JavaScriptCore/interpreter/Interpreter.cpp: (JSC::UnwindFunctor::notifyDebuggerOfUnwinding): (JSC::Interpreter::unwind): * Source/JavaScriptCore/interpreter/ShadowChicken.cpp: (JSC::ShadowChicken::update): * Source/JavaScriptCore/interpreter/StackVisitor.cpp: (JSC::StackVisitor::readFrame): (JSC::StackVisitor::readNonInlinedFrame): (JSC::StackVisitor::Frame::calleeSaveRegistersForUnwinding): * Source/JavaScriptCore/jit/JITExceptions.cpp: (JSC::genericUnwind): * Source/JavaScriptCore/jit/PolymorphicCallStubRoutine.cpp: (JSC::PolymorphicCallStubRoutine::PolymorphicCallStubRoutine): * Source/JavaScriptCore/jsc.cpp: (JSC_DEFINE_HOST_FUNCTION): * Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp: (JSC::getCallerCodeBlock): * Source/JavaScriptCore/runtime/VM.cpp: (JSC::VM::throwException): * Source/JavaScriptCore/runtime/VMTraps.cpp: (JSC::VMTraps::invalidateCodeBlocksOnStack): * Source/JavaScriptCore/tools/VMInspector.cpp: (JSC::VMInspector::dumpRegisters): * Source/JavaScriptCore/wasm/WasmCallee.cpp: (JSC::Wasm::Callee::runWithDowncast): (JSC::Wasm::WasmToJSCallee::WasmToJSCallee): * Source/JavaScriptCore/wasm/WasmCallee.h: * Source/JavaScriptCore/wasm/WasmCompilationMode.cpp: (JSC::Wasm::makeString): * Source/JavaScriptCore/wasm/WasmCompilationMode.h: (JSC::Wasm::isOSREntry): (JSC::Wasm::isAnyBBQ): (JSC::Wasm::isAnyOMG): * Source/JavaScriptCore/wasm/WasmGlobal.cpp: * Source/JavaScriptCore/wasm/WasmGlobal.h: * Source/JavaScriptCore/wasm/WasmInstance.cpp: (JSC::Wasm::Instance::Instance): (JSC::Wasm::Instance::create): (JSC::Wasm::Instance::setGlobal): (JSC::Wasm::Instance::setFunctionWrapper): (JSC::Wasm::Instance::initElementSegment): * Source/JavaScriptCore/wasm/WasmInstance.h: (JSC::Wasm::Instance::setOwner): (JSC::Wasm::Instance::owner const): (JSC::Wasm::Instance::offsetOfGlobalObject): (JSC::Wasm::Instance::globalObject const): (JSC::Wasm::Instance::allocationSize): * Source/JavaScriptCore/wasm/WasmModule.cpp: (JSC::Wasm::Module::Module): * Source/JavaScriptCore/wasm/WasmModule.h: (JSC::Wasm::Module::wasmToJSCallee): * Source/JavaScriptCore/wasm/WasmOperations.cpp: (JSC::Wasm::JSC_DEFINE_JIT_OPERATION): * Source/JavaScriptCore/wasm/WasmOperations.h: * Source/JavaScriptCore/wasm/WasmOperationsInlines.h: (JSC::Wasm::arrayNew): (JSC::Wasm::structNew): (JSC::Wasm::structSet): (JSC::Wasm::throwWasmToJSException): * Source/JavaScriptCore/wasm/WasmSlowPaths.cpp: (JSC::LLInt::WASM_SLOW_PATH_DECL): * Source/JavaScriptCore/wasm/WasmTable.cpp: * Source/JavaScriptCore/wasm/WasmTable.h: (JSC::Wasm::Table::owner const): (JSC::Wasm::Table::setOwner): * Source/JavaScriptCore/wasm/js/JSWebAssemblyInstance.cpp: (JSC::JSWebAssemblyInstance::visitChildrenImpl): (JSC::JSWebAssemblyInstance::tryCreate): * Source/JavaScriptCore/wasm/js/JSWebAssemblyInstance.h: * Source/JavaScriptCore/wasm/js/JSWebAssemblyModule.cpp: (JSC::JSWebAssemblyModule::generateWasmToJSStubs): * Source/JavaScriptCore/wasm/js/WasmToJS.cpp: (JSC::Wasm::handleBadImportTypeUse): (JSC::Wasm::wasmToJS): * Source/JavaScriptCore/wasm/js/WasmToJS.h: * Source/JavaScriptCore/wasm/js/WebAssemblyModuleRecord.cpp: (JSC::WebAssemblyModuleRecord::initializeExports): Canonical link: https://commits.webkit.org/259216@main

webkit-commit-queue · 2023-01-23T17:52:11Z

Committed 259216@main (db4b9bc): https://commits.webkit.org/259216@main

Reviewed commits have been landed. Closing PR #8944 and removing active labels.

Constellation requested review from patrickangle and a team as code owners January 22, 2023 09:06

Constellation self-assigned this Jan 22, 2023

Constellation added the JavaScriptCore For bugs in JavaScriptCore, the JS engine used by WebKit, other than kxmlcore issues. label Jan 22, 2023

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Jan 22, 2023

Constellation removed the merging-blocked Applied to prevent a change from being merged label Jan 22, 2023

Constellation force-pushed the eng/JSC-Clean-up-WasmToJS branch from 1ca9f65 to 0abedce Compare January 22, 2023 09:15

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Jan 22, 2023

Constellation removed the merging-blocked Applied to prevent a change from being merged label Jan 22, 2023

Constellation force-pushed the eng/JSC-Clean-up-WasmToJS branch from 0abedce to b61ea5b Compare January 22, 2023 09:23

Constellation force-pushed the eng/JSC-Clean-up-WasmToJS branch from b61ea5b to 327ecd4 Compare January 22, 2023 11:15

tadeuzagallo approved these changes Jan 23, 2023

View reviewed changes

Constellation added the merge-queue Applied to send a pull request to merge-queue label Jan 23, 2023

webkit-early-warning-system force-pushed the eng/JSC-Clean-up-WasmToJS branch from 327ecd4 to db4b9bc Compare January 23, 2023 17:52

webkit-early-warning-system merged commit db4b9bc into WebKit:main Jan 23, 2023

webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Jan 23, 2023

Constellation deleted the eng/JSC-Clean-up-WasmToJS branch January 23, 2023 18:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[JSC] Clean up WasmToJS #8944

[JSC] Clean up WasmToJS #8944

Constellation commented Jan 22, 2023 •

edited by webkit-early-warning-system

webkit-early-warning-system commented Jan 22, 2023 •

edited

webkit-early-warning-system commented Jan 22, 2023 •

edited

webkit-early-warning-system commented Jan 22, 2023 •

edited

webkit-early-warning-system commented Jan 22, 2023 •

edited

tadeuzagallo left a comment

webkit-commit-queue commented Jan 23, 2023

[JSC] Clean up WasmToJS #8944

[JSC] Clean up WasmToJS #8944

Conversation

Constellation commented Jan 22, 2023 • edited by webkit-early-warning-system

db4b9bc

webkit-early-warning-system commented Jan 22, 2023 • edited

webkit-early-warning-system commented Jan 22, 2023 • edited

webkit-early-warning-system commented Jan 22, 2023 • edited

webkit-early-warning-system commented Jan 22, 2023 • edited

tadeuzagallo left a comment

Choose a reason for hiding this comment

webkit-commit-queue commented Jan 23, 2023

Constellation commented Jan 22, 2023 •

edited by webkit-early-warning-system

`db4b9bc`

webkit-early-warning-system commented Jan 22, 2023 •

edited

webkit-early-warning-system commented Jan 22, 2023 •

edited

webkit-early-warning-system commented Jan 22, 2023 •

edited

webkit-early-warning-system commented Jan 22, 2023 •

edited