Changeset 37050 in webkit for trunk/JavaScriptCore/VM/CodeGenerator.cpp

Timestamp:

Sep 28, 2008, 8:04:08 PM (17 years ago)

Author:

[email protected]

Message:

2008-09-28 Cameron Zwarich <​[email protected]>

Reviewed by Maciej Stachowiak.

Bug 21200: Allow direct access to 'arguments' without using op_resolve
<​https://bugs.webkit.org/show_bug.cgi?id=21200>

Allow fast access to the 'arguments' object by adding an extra slot to
the callframe to store it.

• JavaScriptCore.exp:
• VM/CTI.cpp: (JSC::CTI::privateCompileMainPass):
• VM/CodeBlock.cpp: (JSC::CodeBlock::dump):
• VM/CodeGenerator.cpp: (JSC::CodeGenerator::CodeGenerator): (JSC::CodeGenerator::registerFor):
• VM/CodeGenerator.h: (JSC::CodeGenerator::registerFor):
• VM/Machine.cpp: (JSC::Machine::initializeCallFrame): (JSC::Machine::dumpRegisters): (JSC::Machine::privateExecute): (JSC::Machine::retrieveArguments): (JSC::Machine::cti_op_call_JSFunction): (JSC::Machine::cti_op_create_arguments): (JSC::Machine::cti_op_construct_JSConstruct):
• VM/Machine.h:
• VM/Opcode.h:
• VM/RegisterFile.h: (JSC::RegisterFile::):
• kjs/JSActivation.cpp: (JSC::JSActivation::mark): (JSC::JSActivation::argumentsGetter):
• kjs/JSActivation.h: (JSC::JSActivation::JSActivationData::JSActivationData):
• kjs/NodeInfo.h:
• kjs/Parser.cpp: (JSC::Parser::didFinishParsing):
• kjs/Parser.h: (JSC::Parser::parse):
• kjs/grammar.y:
• kjs/nodes.cpp: (JSC::ScopeNode::ScopeNode): (JSC::ProgramNode::ProgramNode): (JSC::ProgramNode::create): (JSC::EvalNode::EvalNode): (JSC::EvalNode::create): (JSC::FunctionBodyNode::FunctionBodyNode): (JSC::FunctionBodyNode::create):
• kjs/nodes.h: (JSC::ScopeNode::usesArguments):

File:

• trunk/JavaScriptCore/VM/CodeGenerator.cpp (modified) (3 diffs)

trunk/JavaScriptCore/VM/CodeGenerator.cpp

@@ -293 +293 @@
     codeBlock->globalData = m_globalData;
 
+    bool usesArguments = functionBody->usesArguments();
+
     const Node::FunctionStack& functionStack = functionBody->functionStack();
     for (size_t i = 0; i < functionStack.size(); ++i) {
         FuncDeclNode* funcDecl = functionStack[i].get();
         const Identifier& ident = funcDecl->m_ident;
-
+        if (ident == propertyNames().arguments)
+            usesArguments = true;
         m_functions.add(ident.ustring().rep());
         emitNewFunction(addVar(ident, false), funcDecl);
@@ -305 +308 @@
     for (size_t i = 0; i < varStack.size(); ++i) {
         const Identifier& ident = varStack[i].first;
-        if (ident == propertyNames().arguments)
+        if (ident == propertyNames().arguments) {
+            usesArguments = true;
             continue;
+        }
         addVar(ident, varStack[i].second & DeclarationStacks::IsConstant);
+    }
+
+    if (usesArguments) {
+        emitOpcode(op_init_arguments);
+        m_codeBlock->needsFullScopeChain = true;
+        m_argumentsRegister.setIndex(RegisterFile::OptionalCalleeArguments);
+        symbolTable->add(propertyNames().arguments.ustring().rep(), SymbolTableEntry(RegisterFile::OptionalCalleeArguments));
     }
 
@@ -367 +379 @@
 RegisterID* CodeGenerator::registerFor(const Identifier& ident)
 {
-    if (m_codeType == FunctionCode && ident == propertyNames().arguments)
-        m_codeBlock->needsFullScopeChain = true;
-
     if (ident == propertyNames().thisIdentifier)
         return &m_thisRegister;