[JSC] Small cleanup in StackVisitor::readNonInlinedFrame

Xan Lopez · webkit-commit-queue · commit b4ff70c94e5d · 2021-02-02T18:20:19.000Z
https://bugs.webkit.org/show_bug.cgi?id=221259 Patch by Xan Lopez <xan@igalia.com> on 2021-02-02 Reviewed by Yusuke Suzuki. isAnyWasmCallee() will never be true if WebAssembly is disabled at compile time, so we can move a good chunk of code inside the USE(WEBASSEMBLY) check. Also move all constant initializations at the beginning of the method, and remove an unnecessary extra variable. * interpreter/StackVisitor.cpp: (JSC::StackVisitor::readNonInlinedFrame): Canonical link: https://commits.webkit.org/233595@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@272219 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,19 @@
+2021-02-02  Xan Lopez  <xan@igalia.com>
+
+        [JSC] Small cleanup in StackVisitor::readNonInlinedFrame
+        https://bugs.webkit.org/show_bug.cgi?id=221259
+
+        Reviewed by Yusuke Suzuki.
+
+        isAnyWasmCallee() will never be true if WebAssembly is disabled at
+        compile time, so we can move a good chunk of code inside the
+        USE(WEBASSEMBLY) check. Also move all constant initializations at
+        the beginning of the method, and remove an unnecessary extra
+        variable.
+
+        * interpreter/StackVisitor.cpp:
+        (JSC::StackVisitor::readNonInlinedFrame):
+
 2021-02-02  BJ Burg  <bburg@apple.com>
 
         Web Inspector: implement the basics for showing/hiding grid overlays
diff --git a/Source/JavaScriptCore/interpreter/StackVisitor.cpp b/Source/JavaScriptCore/interpreter/StackVisitor.cpp
@@ -161,30 +161,28 @@ void StackVisitor::readNonInlinedFrame(CallFrame* callFrame, CodeOrigin* codeOri
     m_frame.m_callerFrame = callFrame->callerFrame(m_frame.m_callerEntryFrame);
     m_frame.m_callerIsEntryFrame = m_frame.m_callerEntryFrame != m_frame.m_entryFrame;
     m_frame.m_isWasmFrame = false;
+    m_frame.m_callee = callFrame->callee();
+#if ENABLE(DFG_JIT)
+    m_frame.m_inlineCallFrame = nullptr;
+#endif
 
-    CalleeBits callee = callFrame->callee();
-    m_frame.m_callee = callee;
-
+#if ENABLE(WEBASSEMBLY)
     if (callFrame->isAnyWasmCallee()) {
         m_frame.m_isWasmFrame = true;
         m_frame.m_codeBlock = nullptr;
         m_frame.m_bytecodeIndex = BytecodeIndex();
-#if ENABLE(WEBASSEMBLY)
-        CalleeBits bits = callFrame->callee();
-        if (bits.isWasm())
-            m_frame.m_wasmFunctionIndexOrName = bits.asWasmCallee()->indexOrName();
-#endif
-    } else {
-        m_frame.m_codeBlock = callFrame->codeBlock();
-        m_frame.m_bytecodeIndex = !m_frame.codeBlock() ? BytecodeIndex(0)
-            : codeOrigin ? codeOrigin->bytecodeIndex()
-            : callFrame->bytecodeIndex();
 
-    }
+        if (m_frame.m_callee.isWasm())
+            m_frame.m_wasmFunctionIndexOrName = m_frame.m_callee.asWasmCallee()->indexOrName();
 
-#if ENABLE(DFG_JIT)
-    m_frame.m_inlineCallFrame = nullptr;
+        return;
+    }
 #endif
+    m_frame.m_codeBlock = callFrame->codeBlock();
+    m_frame.m_bytecodeIndex = !m_frame.codeBlock() ? BytecodeIndex(0)
+        : codeOrigin ? codeOrigin->bytecodeIndex()
+        : callFrame->bytecodeIndex();
+
 }
 
 #if ENABLE(DFG_JIT)
