Changeset 68281 in webkit for trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.h

Timestamp:

Sep 24, 2010, 12:06:29 PM (15 years ago)

Author:

[email protected]

Message:

REGRESSION(r68223): It broke 2-3 tests on bots (Requested by Ossy on #webkit).
​https://bugs.webkit.org/show_bug.cgi?id=46448

Reviewed by Gavin Barraclough

Roll this back in, with additional logic to prevent us from delaying construction
of functions named "arguments"

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::dump):

• bytecode/Opcode.h:
• bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::BytecodeGenerator):
(JSC::BytecodeGenerator::emitInitLazyRegister):
(JSC::BytecodeGenerator::registerFor):
(JSC::BytecodeGenerator::createLazyRegisterIfNecessary):
(JSC::BytecodeGenerator::constRegisterFor):
(JSC::BytecodeGenerator::emitNewFunction):
(JSC::BytecodeGenerator::emitLazyNewFunction):
(JSC::BytecodeGenerator::emitNewFunctionInternal):

• bytecompiler/BytecodeGenerator.h:
• interpreter/Interpreter.cpp:

(JSC::Interpreter::privateExecute):

• jit/JIT.cpp:

(JSC::JIT::privateCompileMainPass):

• jit/JIT.h:
• jit/JITOpcodes.cpp:

(JSC::JIT::emit_op_init_lazy_reg):
(JSC::JIT::emit_op_new_func):

• jit/JITOpcodes32_64.cpp:

(JSC::JIT::emit_op_init_lazy_reg):

• parser/Nodes.h:

(JSC::ScopeNode::needsActivationForMoreThanVariables):

File:

• trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.h (modified) (5 diffs)

trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.h

@@ -308 +308 @@
 
         RegisterID* emitNewFunction(RegisterID* dst, FunctionBodyNode* body);
+        RegisterID* emitLazyNewFunction(RegisterID* dst, FunctionBodyNode* body);
+        RegisterID* emitNewFunctionInternal(RegisterID* dst, unsigned index, bool shouldNullCheck);
         RegisterID* emitNewFunctionExpression(RegisterID* dst, FuncExprNode* func);
         RegisterID* emitNewRegExp(RegisterID* dst, RegExp* regExp);
@@ -442 +444 @@
         
         RegisterID* emitCall(OpcodeID, RegisterID* dst, RegisterID* func, CallArguments&, unsigned divot, unsigned startOffset, unsigned endOffset);
-        
+
         RegisterID* newRegister();
 
@@ -504 +506 @@
         }
 
+        RegisterID* emitInitLazyRegister(RegisterID*);
+
         Vector<Instruction>& instructions() { return m_codeBlock->instructions(); }
         SymbolTable& symbolTable() { return *m_symbolTable; }
@@ -513 +517 @@
 
         void createArgumentsIfNecessary();
+        RegisterID* createLazyRegisterIfNecessary(RegisterID*);
 
         bool m_shouldEmitDebugHooks;
@@ -552 +557 @@
         int m_globalVarStorageOffset;
 
+        int m_firstLazyFunction;
+        int m_lastLazyFunction;
+        HashMap<unsigned int, FunctionBodyNode*, WTF::IntHash<unsigned int>, WTF::UnsignedWithZeroKeyHashTraits<unsigned int> > m_lazyFunctions;
+        typedef HashMap<FunctionBodyNode*, unsigned> FunctionOffsetMap;
+        FunctionOffsetMap m_functionOffsets;
+        
         // Constant pool
         IdentifierMap m_identifierMap;