Changeset 43220 in webkit for trunk/JavaScriptCore/jit/JITStubs.cpp

Timestamp:

May 5, 2009, 4:34:23 AM (16 years ago)

Author:

[email protected]

Message:

Bug 25559: Improve native function call performance
<​https://bugs.webkit.org/show_bug.cgi?id=25559>

Reviewed by Gavin Barraclough

In order to cache calls to native functions we now make the standard
prototype functions use a small assembly thunk that converts the JS
calling convention into the native calling convention. As this is
only beneficial in the JIT we use the NativeFunctionWrapper typedef
to alternate between PrototypeFunction and JSFunction to keep the
code sane. This change from PrototypeFunction to NativeFunctionWrapper
is the bulk of this patch.

File:

• trunk/JavaScriptCore/jit/JITStubs.cpp (modified) (6 diffs)

trunk/JavaScriptCore/jit/JITStubs.cpp

@@ -75 +75 @@
     , m_ctiVirtualCallLink(0)
     , m_ctiVirtualCall(0)
-{
-    JIT::compileCTIMachineTrampolines(globalData, &m_executablePool, &m_ctiArrayLengthTrampoline, &m_ctiStringLengthTrampoline, &m_ctiVirtualCallPreLink, &m_ctiVirtualCallLink, &m_ctiVirtualCall);
+    , m_ctiNativeCallThunk(0)
+{
+    JIT::compileCTIMachineTrampolines(globalData, &m_executablePool, &m_ctiArrayLengthTrampoline, &m_ctiStringLengthTrampoline, &m_ctiVirtualCallPreLink, &m_ctiVirtualCallLink, &m_ctiVirtualCall, &m_ctiNativeCallThunk);
 }
 
@@ -820 +821 @@
 #endif
 
-    ScopeChainNode* callDataScopeChain = asFunction(ARG_src1)->scope().node();
-    CodeBlock* newCodeBlock = &asFunction(ARG_src1)->body()->bytecode(callDataScopeChain);
-
-    if (!newCodeBlock->jitCode())
-        JIT::compile(ARG_globalData, newCodeBlock);
-
-    return newCodeBlock;
+    JSFunction* function = asFunction(ARG_src1);
+    FunctionBodyNode* body = function->body();
+    ScopeChainNode* callDataScopeChain = function->scope().node();
+    body->jitCode(callDataScopeChain);
+
+    return &(body->generatedBytecode());
 }
 
@@ -880 +880 @@
     JSGlobalData* globalData = ARG_globalData;
     JSFunction* callee = asFunction(ARG_src1);
-    CodeBlock* codeBlock = &callee->body()->bytecode(callee->scope().node());
-    if (!codeBlock->jitCode())
-        JIT::compile(globalData, codeBlock);
+    JITCode jitCode = callee->body()->generatedJITCode();
+    ASSERT(jitCode);
 
     ctiPatchNearCallByReturnAddress(ARG_returnAddress2, globalData->jitStubs.ctiVirtualCallLink());
 
-    return codeBlock->jitCode().addressForCall();
+    return jitCode.addressForCall();
 }
 
@@ -894 +893 @@
 
     JSFunction* callee = asFunction(ARG_src1);
-    CodeBlock* codeBlock = &callee->body()->bytecode(callee->scope().node());
-    if (!codeBlock->jitCode())
-        JIT::compile(ARG_globalData, codeBlock);
+    JITCode jitCode = callee->body()->generatedJITCode();
+    ASSERT(jitCode);
+    
+    CodeBlock* codeBlock = 0;
+    if (!callee->isHostFunction())
+        codeBlock = &callee->body()->bytecode(callee->scope().node());
 
     CallLinkInfo* callLinkInfo = &ARG_callFrame->callerFrame()->codeBlock()->getCallLinkInfo(ARG_returnAddress2);
-    JIT::linkCall(callee, codeBlock, codeBlock->jitCode(), callLinkInfo, ARG_int3);
-
-    return codeBlock->jitCode().addressForCall();
+    JIT::linkCall(callee, codeBlock, jitCode, callLinkInfo, ARG_int3);
+
+    return jitCode.addressForCall();
 }
 
@@ -1060 +1062 @@
     BEGIN_STUB_FUNCTION();
 
+    JSFunction* constructor = asFunction(ARG_src1);
+    if (constructor->isHostFunction()) {
+        CallFrame* callFrame = ARG_callFrame;
+        CodeBlock* codeBlock = callFrame->codeBlock();
+        unsigned vPCIndex = codeBlock->getBytecodeIndex(callFrame, STUB_RETURN_ADDRESS);
+        ARG_globalData->exception = createNotAConstructorError(callFrame, constructor, vPCIndex, codeBlock);
+        VM_THROW_EXCEPTION();
+    }
+
 #ifndef NDEBUG
     ConstructData constructData;
-    ASSERT(asFunction(ARG_src1)->getConstructData(constructData) == ConstructTypeJS);
+    ASSERT(constructor->getConstructData(constructData) == ConstructTypeJS);
 #endif
 
@@ -1069 +1080 @@
         structure = asObject(ARG_src4)->inheritorID();
     else
-        structure = asFunction(ARG_src1)->scope().node()->globalObject()->emptyObjectStructure();
+        structure = constructor->scope().node()->globalObject()->emptyObjectStructure();
     return new (ARG_globalData) JSObject(structure);
 }