Changeset 284513 in webkit for trunk/Source/JavaScriptCore/jit/JSInterfaceJIT.h

Timestamp:

Oct 19, 2021, 5:40:19 PM (4 years ago)

Author:

Tadeu Zagallo

Message:

Address post-landing feedback to wasm exceptions
​https://bugs.webkit.org/show_bug.cgi?id=231973

Reviewed by Saam Barati.

Address comments left by Saam in ​https://bugs.webkit.org/show_bug.cgi?id=229681
after the patch landed. This includes deleting some unused code, and renaming a
couple variables and methods, but the biggest change is copying the callee saves
to VMEntry in the llint rethrow.

• interpreter/Interpreter.cpp:

(JSC::CatchInfo::CatchInfo):
(JSC::UnwindFunctor::operator() const):

• interpreter/Interpreter.h:

(JSC::CatchInfo::CatchInfo): Deleted.

• jit/JSInterfaceJIT.h:

(JSC::JSInterfaceJIT::convertCalleeToVM): Deleted.

• llint/WebAssembly.asm:
• wasm/WasmB3IRGenerator.cpp:

(JSC::Wasm::B3IRGenerator::ControlData::ControlData):
(JSC::Wasm::B3IRGenerator::ControlData::tryDepth const):
(JSC::Wasm::B3IRGenerator::connectControlAtEntrypoint):
(JSC::Wasm::B3IRGenerator::addLoop):
(JSC::Wasm::B3IRGenerator::addTry):
(JSC::Wasm::B3IRGenerator::preparePatchpointForExceptions):
(JSC::Wasm::B3IRGenerator::emitCatchImpl):
(JSC::Wasm::B3IRGenerator::addDelegateToUnreachable):
(JSC::Wasm::B3IRGenerator::addThrow):
(JSC::Wasm::B3IRGenerator::addRethrow):
(JSC::Wasm::B3IRGenerator::addEndToUnreachable):
(JSC::Wasm::B3IRGenerator::connectControlEntry): Deleted.

• wasm/WasmCallee.h:

(JSC::Wasm::Callee::llintFunctionCodeBlock const):
(JSC::Wasm::Callee::functionCodeBlock const): Deleted.

• wasm/WasmLLIntGenerator.cpp:

(JSC::Wasm::LLIntGenerator::unifyValuesWithBlock):
(JSC::Wasm::LLIntGenerator::addTry):
(JSC::Wasm::LLIntGenerator::addThrow):
(JSC::Wasm::LLIntGenerator::repatch): Deleted.

• wasm/WasmOperations.cpp:

(JSC::Wasm::JSC_DEFINE_JIT_OPERATION):

• wasm/WasmOperations.h:

File:

• trunk/Source/JavaScriptCore/jit/JSInterfaceJIT.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/jit/JSInterfaceJIT.h

@@ -58 +58 @@
         void emitPutToCallFrameHeader(void* value, VirtualRegister entry);
         void emitPutCellToCallFrameHeader(RegisterID from, VirtualRegister entry);
-        void convertCalleeToVM(RegisterID callee);
 
         VM* vm() const { return m_vm; }
@@ -160 +159 @@
     }
 
-    ALWAYS_INLINE void JSInterfaceJIT::convertCalleeToVM(RegisterID callee)
-    {
-        auto preciseAllocationCase = branchTestPtr(CCallHelpers::NonZero, callee, CCallHelpers::TrustedImm32(PreciseAllocation::halfAlignment));
-        andPtr(CCallHelpers::TrustedImmPtr(MarkedBlock::blockMask), callee);
-        loadPtr(CCallHelpers::Address(callee, MarkedBlock::offsetOfFooter + MarkedBlock::Footer::offsetOfVM()), callee);
-        auto loadedCase = jump();
-
-        preciseAllocationCase.link(this);
-        loadPtr(CCallHelpers::Address(callee, PreciseAllocation::offsetOfWeakSet() + WeakSet::offsetOfVM() - PreciseAllocation::headerSize()), callee);
-
-        loadedCase.link(this);
-    }
-
 } // namespace JSC