Changeset 292447 in webkit for trunk/Source/JavaScriptCore/dfg

Timestamp:

Apr 5, 2022, 8:41:00 PM (3 years ago)

Author:

[email protected]

Message:

[JSC] Use inlined assertion for CodeBlock type
​https://bugs.webkit.org/show_bug.cgi?id=238849

Reviewed by Michael Saboff.

We introduced probeDebug-based CodeBlock assertion, but it is too slow and causing timeout on Debug JSC tests.
Instead, we use inlined assertion which is much faster to prevent these Debug build timeout.

• assembler/AbortReason.h:
• dfg/DFGJITCompiler.cpp:

(JSC::DFG::JITCompiler::compileEntry):

• dfg/DFGSpeculativeJIT.cpp:

(JSC::DFG::SpeculativeJIT::compileCurrentBlock):

• dfg/DFGThunks.cpp:

(JSC::DFG::osrEntryThunkGenerator):

• ftl/FTLLowerDFGToB3.cpp:

(JSC::FTL::DFG::LowerDFGToB3::lower):

• jit/AssemblyHelpers.cpp:

(JSC::AssemblyHelpers::jitAssertCodeBlockOnCallFrameWithType):
(JSC::AssemblyHelpers::jitAssertCodeBlockOnCallFrameIsOptimizingJIT):

• jit/AssemblyHelpers.h:

(JSC::AssemblyHelpers::jitAssertCodeBlockOnCallFrameWithType):
(JSC::AssemblyHelpers::jitAssertCodeBlockOnCallFrameIsOptimizingJIT):

• jit/JIT.cpp:

(JSC::JIT::compileAndLinkWithoutFinalizing):

• jit/JITCode.h:

(JSC::JITCode::offsetOfJITType):

Location:

trunk/Source/JavaScriptCore/dfg

Files:

• DFGJITCompiler.cpp (modified) (1 diff)
• DFGSpeculativeJIT.cpp (modified) (1 diff)
• DFGThunks.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp

@@ -112 +112 @@
     // both normal return code and when jumping to an exception handler).
     emitFunctionPrologue();
-#if ASSERT_ENABLED
-    probeDebug([=](Probe::Context& ctx) {
-        CodeBlock* codeBlock = ctx.fp<CallFrame*>()->codeBlock();
-        RELEASE_ASSERT(codeBlock->jitType() == JITType::DFGJIT);
-    });
-#endif
+    jitAssertCodeBlockOnCallFrameWithType(GPRInfo::regT2, JITType::DFGJIT);
 }
 

trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp

@@ -2217 +2217 @@
         m_jit.addPtr(CCallHelpers::TrustedImm32(-(m_graph.frameRegisterCount() * sizeof(Register))), GPRInfo::callFrameRegister,  CCallHelpers::stackPointerRegister);
         m_jit.emitSaveCalleeSaves();
+        // CodeBlock in the stack is already replaced in OSR entry.
+#if USE(JSVALUE64)
+        // Use numberTagRegister as a scratch since it is recovered after this.
+        m_jit.jitAssertCodeBlockOnCallFrameWithType(GPRInfo::numberTagRegister, JITType::DFGJIT);
+#endif
         m_jit.emitMaterializeTagCheckRegisters();
-        // CodeBlock in the stack is already replaced in OSR entry.
     }
 

trunk/Source/JavaScriptCore/dfg/DFGThunks.cpp

@@ -164 +164 @@
     ok.link(&jit);
 
-#if ASSERT_ENABLED
-    jit.probeDebug([](Probe::Context& ctx) {
-        CodeBlock* codeBlock = ctx.fp<CallFrame*>()->codeBlock();
-        RELEASE_ASSERT(JITCode::isOptimizingJIT(codeBlock->jitType()));
-    });
-#endif
+    jit.jitAssertCodeBlockOnCallFrameIsOptimizingJIT(GPRInfo::regT2);
 
     jit.restoreCalleeSavesFromEntryFrameCalleeSavesBuffer(vm.topEntryFrame);