Changeset 283129 in webkit for trunk/Source/JavaScriptCore/jit/JITCompilationKey.h

Timestamp:

Sep 27, 2021, 12:33:18 PM (4 years ago)

Author:

[email protected]

Message:

Unreviewed, reverting r283102, r283103 and r283104.
​https://bugs.webkit.org/show_bug.cgi?id=230854

It regresses JetStream2 on iOS devices

Reverted changesets:

"Build an unlinked baseline JIT"
​https://bugs.webkit.org/show_bug.cgi?id=229223
​https://commits.webkit.org/r283102

"Unreviewed, fix CLoop build"
​https://bugs.webkit.org/show_bug.cgi?id=229223
​https://commits.webkit.org/r283103

"Unreviewed, fix CLoop build part 2"
​https://bugs.webkit.org/show_bug.cgi?id=229223
​https://commits.webkit.org/r283104

File:

• trunk/Source/JavaScriptCore/jit/JITCompilationKey.h (modified) (5 diffs)

trunk/Source/JavaScriptCore/jit/JITCompilationKey.h

@@ -31 +31 @@
 namespace JSC {
 
-class JSCell;
+class CodeBlock;
+class CodeBlockSet;
 
 class JITCompilationKey {
 public:
     JITCompilationKey()
-        : m_codeBlock(nullptr)
+        : m_profiledBlock(nullptr)
         , m_mode(JITCompilationMode::InvalidCompilation)
     {
@@ -42 +43 @@
     
     JITCompilationKey(WTF::HashTableDeletedValueType)
-        : m_codeBlock(nullptr)
+        : m_profiledBlock(nullptr)
         , m_mode(JITCompilationMode::DFG)
     {
     }
     
-    JITCompilationKey(JSCell* profiledBlock, JITCompilationMode mode)
-        : m_codeBlock(profiledBlock)
+    JITCompilationKey(CodeBlock* profiledBlock, JITCompilationMode mode)
+        : m_profiledBlock(profiledBlock)
         , m_mode(mode)
     {
@@ -55 +56 @@
     bool operator!() const
     {
-        return !m_codeBlock && m_mode == JITCompilationMode::InvalidCompilation;
+        return !m_profiledBlock && m_mode == JITCompilationMode::InvalidCompilation;
     }
     
     bool isHashTableDeletedValue() const
     {
-        return !m_codeBlock && m_mode != JITCompilationMode::InvalidCompilation;
+        return !m_profiledBlock && m_mode != JITCompilationMode::InvalidCompilation;
     }
     
+    CodeBlock* profiledBlock() const { return m_profiledBlock; }
     JITCompilationMode mode() const { return m_mode; }
     
     bool operator==(const JITCompilationKey& other) const
     {
-        return m_codeBlock == other.m_codeBlock
+        return m_profiledBlock == other.m_profiledBlock
             && m_mode == other.m_mode;
     }
@@ -73 +75 @@
     unsigned hash() const
     {
-        return WTF::pairIntHash(WTF::PtrHash<JSCell*>::hash(m_codeBlock), static_cast<std::underlying_type<JITCompilationMode>::type>(m_mode));
+        return WTF::pairIntHash(WTF::PtrHash<CodeBlock*>::hash(m_profiledBlock), static_cast<std::underlying_type<JITCompilationMode>::type>(m_mode));
     }
     
@@ -79 +81 @@
 
 private:
-    // Either CodeBlock* or UnlinkedCodeBlock* for basleline JIT.
-    JSCell* m_codeBlock;
+    CodeBlock* m_profiledBlock;
     JITCompilationMode m_mode;
 };