Changeset 39366 in webkit for trunk/JavaScriptCore

Timestamp:

Dec 17, 2008, 1:25:40 PM (16 years ago)

Author:

[email protected]

Message:

2008-12-17 Sam Weinig <​[email protected]>

Reviewed by Darin Adler.

Fix for ​https://bugs.webkit.org/show_bug.cgi?id=22897
<rdar://problem/6428342>
Look into feasibility of discarding bytecode after native codegen

Clear the bytecode Instruction vector at the end JIT generation.

Saves 4.8 MB on Membuster head.

• bytecode/CodeBlock.cpp: (JSC::CodeBlock::dump): Add logging for the case that someone tries to dump the instructions of a CodeBlock that has had its bytecode vector cleared. (JSC::CodeBlock::CodeBlock): Initialize the instructionCount (JSC::CodeBlock::handlerForBytecodeOffset): Use instructionCount instead of the size of the instruction vector in the assertion. (JSC::CodeBlock::lineNumberForBytecodeOffset): Ditto. (JSC::CodeBlock::expressionRangeForBytecodeOffset): Ditto. (JSC::CodeBlock::getByIdExceptionInfoForBytecodeOffset): Ditto. (JSC::CodeBlock::functionRegisterForBytecodeOffset): Ditto.
• bytecode/CodeBlock.h: (JSC::CodeBlock::setInstructionCount): Store the instruction vector size in debug builds for assertions.
• bytecompiler/BytecodeGenerator.cpp: (JSC::BytecodeGenerator::generate):
• jit/JIT.cpp: (JSC::JIT::privateCompile): Clear the bytecode vector unless we have compiled with Opcode sampling where we will continue to require it

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecode/CodeBlock.cpp (modified) (9 diffs)
• bytecode/CodeBlock.h (modified) (2 diffs)
• bytecompiler/BytecodeGenerator.cpp (modified) (2 diffs)
• bytecompiler/BytecodeGenerator.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-12-17  Sam Weinig  <[email protected]>
+
+        Reviewed by Darin Adler.
+
+        Fix for https://bugs.webkit.org/show_bug.cgi?id=22897
+        <rdar://problem/6428342>
+        Look into feasibility of discarding bytecode after native codegen
+
+        Clear the bytecode Instruction vector at the end JIT generation.
+
+        Saves 4.8 MB on Membuster head.
+
+        * bytecode/CodeBlock.cpp:
+        (JSC::CodeBlock::dump): Add logging for the case that someone tries
+        to dump the instructions of a CodeBlock that has had its bytecode
+        vector cleared.
+        (JSC::CodeBlock::CodeBlock): Initialize the instructionCount
+        (JSC::CodeBlock::handlerForBytecodeOffset): Use instructionCount instead
+        of the size of the instruction vector in the assertion.
+        (JSC::CodeBlock::lineNumberForBytecodeOffset): Ditto.
+        (JSC::CodeBlock::expressionRangeForBytecodeOffset): Ditto.
+        (JSC::CodeBlock::getByIdExceptionInfoForBytecodeOffset): Ditto.
+        (JSC::CodeBlock::functionRegisterForBytecodeOffset): Ditto.
+        * bytecode/CodeBlock.h:
+        (JSC::CodeBlock::setInstructionCount): Store the instruction vector size
+        in debug builds for assertions.
+        * bytecompiler/BytecodeGenerator.cpp:
+        (JSC::BytecodeGenerator::generate):
+        * jit/JIT.cpp:
+        (JSC::JIT::privateCompile): Clear the bytecode vector unless we
+        have compiled with Opcode sampling where we will continue to require it
+
 2008-12-17  Cary Clark  <[email protected]>
 

trunk/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -35 +35 @@
 #include "Interpreter.h"
 #include "Debugger.h"
+#include "BytecodeGenerator.h"
 #include <stdio.h>
 #include <wtf/StringExtras.h>
@@ -323 +324 @@
 void CodeBlock::dump(ExecState* exec) const
 {
+    if (m_instructions.isEmpty()) {
+        printf("No instructions available.\n");
+        return;
+    }
+
     size_t instructionCount = 0;
 
@@ -1173 +1179 @@
     , m_ownerNode(ownerNode)
     , m_globalData(0)
+#ifndef NDEBUG
+    , m_instructionCount(0)
+#endif
     , m_needsFullScopeChain(ownerNode->needsActivation())
     , m_usesEval(ownerNode->usesEval())
@@ -1330 +1339 @@
 HandlerInfo* CodeBlock::handlerForBytecodeOffset(unsigned bytecodeOffset)
 {
+    ASSERT(bytecodeOffset < m_instructionCount);
+
     if (!m_rareData)
         return 0;
-
-    ASSERT(bytecodeOffset < m_instructions.size());
     
     Vector<HandlerInfo>& exceptionHandlers = m_rareData->m_exceptionHandlers;
@@ -1348 +1357 @@
 int CodeBlock::lineNumberForBytecodeOffset(unsigned bytecodeOffset)
 {
-    ASSERT(bytecodeOffset < m_instructions.size());
+    ASSERT(bytecodeOffset < m_instructionCount);
 
     if (!m_lineInfo.size())
@@ -1370 +1379 @@
 int CodeBlock::expressionRangeForBytecodeOffset(unsigned bytecodeOffset, int& divot, int& startOffset, int& endOffset)
 {
-    ASSERT(bytecodeOffset < m_instructions.size());
+    ASSERT(bytecodeOffset < m_instructionCount);
 
     if (!m_expressionInfo.size()) {
@@ -1406 +1415 @@
 bool CodeBlock::getByIdExceptionInfoForBytecodeOffset(unsigned bytecodeOffset, OpcodeID& opcodeID)
 {
-    ASSERT(bytecodeOffset < m_instructions.size());
+    ASSERT(bytecodeOffset < m_instructionCount);
 
     if (!m_getByIdExceptionInfo.size())
@@ -1431 +1440 @@
 bool CodeBlock::functionRegisterForBytecodeOffset(unsigned bytecodeOffset, int& functionRegisterIndex)
 {
-    ASSERT(bytecodeOffset < m_instructions.size());
+    ASSERT(bytecodeOffset < m_instructionCount);
 
     if (!m_rareData || !m_rareData->m_functionRegisterInfos.size())
@@ -1451 +1460 @@
     functionRegisterIndex = m_rareData->m_functionRegisterInfos[low - 1].functionRegisterIndex;
     return true;
+}
+
+void CodeBlock::setJITCode(JITCodeRef& jitCode)
+{
+    m_jitCode = jitCode;
+#if !ENABLE(OPCODE_SAMPLING)
+    if (!BytecodeGenerator::dumpsGeneratedCode())
+        m_instructions.clear();
+#endif
 }
 #endif

trunk/JavaScriptCore/bytecode/CodeBlock.h

@@ -307 +307 @@
 
         Vector<Instruction>& instructions() { return m_instructions; }
-
-#if ENABLE(JIT)
-        void setJITCode(JITCodeRef& jitCode) { m_jitCode = jitCode; }
+#ifndef NDEBUG
+        void setInstructionCount(unsigned instructionCount) { m_instructionCount = instructionCount; }
+#endif
+
+#if ENABLE(JIT)
+        void setJITCode(JITCodeRef& jitCode);
         void* jitCode() { return m_jitCode.code; }
         ExecutablePool* executablePool() { return m_jitCode.executablePool.get(); }
@@ -440 +443 @@
 
         Vector<Instruction> m_instructions;
+#ifndef NDEBUG
+        unsigned m_instructionCount;
+#endif
 #if ENABLE(JIT)
         JITCodeRef m_jitCode;

trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp

@@ -128 +128 @@
 }
 
+bool BytecodeGenerator::dumpsGeneratedCode()
+{
+#ifndef NDEBUG
+    return s_dumpsGeneratedCode;
+#else
+    return false;
+#endif
+}
+
 void BytecodeGenerator::generate()
 {
@@ -135 +144 @@
 
 #ifndef NDEBUG
+    m_codeBlock->setInstructionCount(m_codeBlock->instructions().size());
+
     if (s_dumpsGeneratedCode) {
         JSGlobalObject* globalObject = m_scopeChain->globalObject();

trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.h

@@ -67 +67 @@
 
         static void setDumpsGeneratedCode(bool dumpsGeneratedCode);
+        static bool dumpsGeneratedCode();
 
         BytecodeGenerator(ProgramNode*, const Debugger*, const ScopeChain&, SymbolTable*, ProgramCodeBlock*);