Changeset 90414 in webkit for trunk/Source/JavaScriptCore/runtime/Executable.h

Timestamp:

Jul 5, 2011, 4:18:23 PM (14 years ago)

Author:

[email protected]

Message:

2011-07-05 Filip Pizlo <​[email protected]>

JSC JIT has code duplication for the handling of call and construct
​https://bugs.webkit.org/show_bug.cgi?id=63957

Reviewed by Gavin Barraclough.

• jit/JIT.cpp: (JSC::JIT::linkFor):
• jit/JIT.h:
• jit/JITStubs.cpp: (JSC::jitCompileFor): (JSC::DEFINE_STUB_FUNCTION): (JSC::arityCheckFor): (JSC::lazyLinkFor):
• runtime/Executable.h: (JSC::ExecutableBase::generatedJITCodeFor): (JSC::FunctionExecutable::compileFor): (JSC::FunctionExecutable::isGeneratedFor): (JSC::FunctionExecutable::generatedBytecodeFor): (JSC::FunctionExecutable::generatedJITCodeWithArityCheckFor):

File:

• trunk/Source/JavaScriptCore/runtime/Executable.h (modified) (4 diffs)

trunk/Source/JavaScriptCore/runtime/Executable.h

@@ -44 +44 @@
 
     struct ExceptionInfo;
+    
+    enum CodeSpecializationKind { CodeForCall, CodeForConstruct };
 
     class ExecutableBase : public JSCell {
@@ -91 +93 @@
             ASSERT(m_jitCodeForConstruct);
             return m_jitCodeForConstruct;
+        }
+        
+        JITCode& generatedJITCodeFor(CodeSpecializationKind kind)
+        {
+            if (kind == CodeForCall)
+                return generatedJITCodeForCall();
+            ASSERT(kind == CodeForConstruct);
+            return generatedJITCodeForConstruct();
         }
 
@@ -388 +398 @@
             return *m_codeBlockForConstruct;
         }
+        
+        JSObject* compileFor(ExecState* exec, ScopeChainNode* scopeChainNode, CodeSpecializationKind kind)
+        {
+            if (kind == CodeForCall)
+                return compileForCall(exec, scopeChainNode);
+            ASSERT(kind == CodeForConstruct);
+            return compileForConstruct(exec, scopeChainNode);
+        }
+        
+        bool isGeneratedFor(CodeSpecializationKind kind)
+        {
+            if (kind == CodeForCall)
+                return isGeneratedForCall();
+            ASSERT(kind == CodeForConstruct);
+            return isGeneratedForConstruct();
+        }
+        
+        FunctionCodeBlock& generatedBytecodeFor(CodeSpecializationKind kind)
+        {
+            if (kind == CodeForCall)
+                return generatedBytecodeForCall();
+            ASSERT(kind == CodeForConstruct);
+            return generatedBytecodeForConstruct();
+        }
 
         const Identifier& name() { return m_name; }
@@ -437 +471 @@
             ASSERT(m_jitCodeForConstructWithArityCheck);
             return m_jitCodeForConstructWithArityCheck;
+        }
+        
+        MacroAssemblerCodePtr generatedJITCodeWithArityCheckFor(CodeSpecializationKind kind)
+        {
+            if (kind == CodeForCall)
+                return generatedJITCodeForCallWithArityCheck();
+            ASSERT(kind == CodeForConstruct);
+            return generatedJITCodeForConstructWithArityCheck();
         }
 #endif