Changeset 164835 in webkit for trunk/Source/JavaScriptCore/parser

Timestamp:

Feb 27, 2014, 3:25:29 PM (11 years ago)

Author:

[email protected]

Message:

Slow cases for function.apply and function.call should not require vm re-entry
​https://bugs.webkit.org/show_bug.cgi?id=129454

Reviewed by Geoffrey Garen.

Implement call and apply using builtins. Happily the use
of @call and @apply don't perform function equality checks
and just plant direct var_args calls. This did expose a few
codegen issues, but they're all covered by existing tests
once call and apply are implemented in JS.

• JavaScriptCore.xcodeproj/project.pbxproj:
• builtins/Function.prototype.js: Added.

(call):
(apply):

• bytecompiler/NodesCodegen.cpp:

(JSC::CallFunctionCallDotNode::emitBytecode):
(JSC::ApplyFunctionCallDotNode::emitBytecode):

• dfg/DFGCapabilities.cpp:

(JSC::DFG::capabilityLevel):

• interpreter/Interpreter.cpp:

(JSC::sizeFrameForVarargs):
(JSC::loadVarargs):

• interpreter/Interpreter.h:
• jit/JITCall.cpp:

(JSC::JIT::compileLoadVarargs):

• parser/ASTBuilder.h:

(JSC::ASTBuilder::makeFunctionCallNode):

• parser/Lexer.cpp:

(JSC::isSafeBuiltinIdentifier):

• runtime/CommonIdentifiers.h:
• runtime/FunctionPrototype.cpp:

(JSC::FunctionPrototype::addFunctionProperties):

• runtime/JSObject.cpp:

(JSC::JSObject::putDirectBuiltinFunction):
(JSC::JSObject::putDirectBuiltinFunctionWithoutTransition):

• runtime/JSObject.h:

Location:

trunk/Source/JavaScriptCore/parser

Files:

• ASTBuilder.h (modified) (2 diffs)
• Lexer.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/parser/ASTBuilder.h

@@ -27 +27 @@
 #define ASTBuilder_h
 
+#include "BuiltinNames.h"
 #include "NodeConstructors.h"
 #include "SyntaxChecker.h"
@@ -889 +890 @@
     DotAccessorNode* dot = static_cast<DotAccessorNode*>(func);
     FunctionCallDotNode* node;
-    if (dot->identifier() == m_vm->propertyNames->call || dot->identifier() == m_vm->propertyNames->callPrivateName)
+    if (dot->identifier() == m_vm->propertyNames->builtinNames().callPublicName() || dot->identifier() == m_vm->propertyNames->builtinNames().callPrivateName())
         node = new (m_vm) CallFunctionCallDotNode(location, dot->base(), dot->identifier(), args, divot, divotStart, divotEnd);
-    else if (dot->identifier() == m_vm->propertyNames->apply || dot->identifier() == m_vm->propertyNames->applyPrivateName)
+    else if (dot->identifier() == m_vm->propertyNames->builtinNames().applyPublicName() || dot->identifier() == m_vm->propertyNames->builtinNames().applyPrivateName())
         node = new (m_vm) ApplyFunctionCallDotNode(location, dot->base(), dot->identifier(), args, divot, divotStart, divotEnd);
     else

trunk/Source/JavaScriptCore/parser/Lexer.cpp

@@ -28 +28 @@
 #include "JSFunctionInlines.h"
 
+#include "BuiltinNames.h"
 #include "JSGlobalObjectFunctions.h"
 #include "Identifier.h"
@@ -766 +767 @@
      * be used as a safety net while implementing builtins.
      */
-    if (*ident == vm.propertyNames->call)
+    if (*ident == vm.propertyNames->builtinNames().callPublicName())
         return false;
-    if (*ident == vm.propertyNames->apply)
+    if (*ident == vm.propertyNames->builtinNames().applyPublicName())
         return false;
     if (*ident == vm.propertyNames->eval)