Changeset 104630 in webkit for trunk/Source/JavaScriptCore/bytecode/CodeBlock.h

Timestamp:

Jan 10, 2012, 2:08:47 PM (13 years ago)

Author:

[email protected]

Message:

CodeBlock::m_numParameters should be encapsulated
​https://bugs.webkit.org/show_bug.cgi?id=75985
<rdar://problem/10671020>

Reviewed by Oliver Hunt.

Encapsulated CodeBlock::m_numParameters and hooked argument profile creation
into it. This appears to be performance neutral.

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::CodeBlock):
(JSC::CodeBlock::setNumParameters):
(JSC::CodeBlock::addParameter):

• bytecode/CodeBlock.h:

(JSC::CodeBlock::numParameters):
(JSC::CodeBlock::addressOfNumParameters):
(JSC::CodeBlock::offsetOfNumParameters):
(JSC::CodeBlock::numberOfArgumentValueProfiles):

• bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::BytecodeGenerator):
(JSC::BytecodeGenerator::addParameter):
(JSC::BytecodeGenerator::emitReturn):

• dfg/DFGAbstractState.cpp:

(JSC::DFG::AbstractState::AbstractState):

• dfg/DFGByteCodeParser.cpp:

(JSC::DFG::ByteCodeParser::ByteCodeParser):
(JSC::DFG::ByteCodeParser::InlineStackEntry::InlineStackEntry):

• dfg/DFGGraph.cpp:

(JSC::DFG::Graph::predictArgumentTypes):

• dfg/DFGJITCompiler.cpp:

(JSC::DFG::JITCompiler::compileFunction):

• dfg/DFGOperations.cpp:
• dfg/DFGSpeculativeJIT.cpp:

(JSC::DFG::SpeculativeJIT::checkArgumentTypes):

• dfg/DFGSpeculativeJIT.h:

(JSC::DFG::SpeculativeJIT::SpeculativeJIT):

• interpreter/Interpreter.cpp:

(JSC::Interpreter::slideRegisterWindowForCall):
(JSC::Interpreter::dumpRegisters):
(JSC::Interpreter::execute):
(JSC::Interpreter::prepareForRepeatCall):

• jit/JIT.cpp:

(JSC::JIT::privateCompile):

• jit/JITStubs.cpp:

(JSC::arityCheckFor):
(JSC::lazyLinkFor):

• runtime/Executable.cpp:

(JSC::FunctionExecutable::compileForCallInternal):
(JSC::FunctionExecutable::compileForConstructInternal):

File:

• trunk/Source/JavaScriptCore/bytecode/CodeBlock.h (modified) (4 diffs)

trunk/Source/JavaScriptCore/bytecode/CodeBlock.h

@@ -269 +269 @@
     public:
         virtual ~CodeBlock();
+        
+        int numParameters() const { return m_numParameters; }
+        void setNumParameters(int newValue);
+        void addParameter();
+        
+        int* addressOfNumParameters() { return &m_numParameters; }
+        static ptrdiff_t offsetOfNumParameters() { return OBJECT_OFFSETOF(CodeBlock, m_numParameters); }
 
         CodeBlock* alternative() { return m_alternative.get(); }
@@ -658 +665 @@
         
 #if ENABLE(VALUE_PROFILER)
-        void setArgumentValueProfileSize(unsigned size)
-        {
-            m_argumentValueProfiles.resize(size);
-        }
         unsigned numberOfArgumentValueProfiles()
         {
+            ASSERT(m_numParameters >= 0);
+            ASSERT(m_argumentValueProfiles.size() == static_cast<unsigned>(m_numParameters));
             return m_argumentValueProfiles.size();
         }
@@ -1132 +1137 @@
         int m_numVars;
         int m_numCapturedVars;
-        int m_numParameters;
         bool m_isConstructor;
 
@@ -1196 +1200 @@
         }
         
+        int m_numParameters;
+
         WriteBarrier<ScriptExecutable> m_ownerExecutable;
         JSGlobalData* m_globalData;