Changeset 44844 in webkit for trunk/JavaScriptCore/bytecode

Timestamp:

Jun 19, 2009, 12:10:49 AM (16 years ago)

Author:

[email protected]

Message:

Bug 26532: Native functions do not correctly unlink from optimised callsites when they're collected
<​https://bugs.webkit.org/show_bug.cgi?id=26532> <rdar://problem/6625385>

Reviewed by Gavin "Viceroy of Venezuela" Barraclough.

We need to make sure that each native function instance correctly unlinks any references to it
when it is collected. Allowing this to happen required a few changes:

• Every native function needs a codeblock to track the link information
• To have this codeblock, every function now also needs its own functionbodynode so we no longer get to have a single shared instance.
• Identifying a host function is now done by looking for CodeBlock::codeType() == NativeCode

Location:

trunk/JavaScriptCore/bytecode

Files:

• CodeBlock.cpp (modified) (12 diffs)
• CodeBlock.h (modified) (5 diffs)

trunk/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -1266 +1266 @@
 }
 
+CodeBlock::CodeBlock(ScopeNode* ownerNode)
+    : m_numCalleeRegisters(0)
+    , m_numConstants(0)
+    , m_numVars(0)
+    , m_numParameters(0)
+    , m_ownerNode(ownerNode)
+    , m_globalData(0)
+#ifndef NDEBUG
+    , m_instructionCount(0)
+#endif
+    , m_needsFullScopeChain(false)
+    , m_usesEval(false)
+    , m_isNumericCompareFunction(false)
+    , m_codeType(NativeCode)
+    , m_source(0)
+    , m_sourceOffset(0)
+    , m_exceptionInfo(0)
+{
+#if DUMP_CODE_BLOCK_STATISTICS
+    liveCodeBlockSet.add(this);
+#endif
+}
 
 CodeBlock::CodeBlock(ScopeNode* ownerNode, CodeType codeType, PassRefPtr<SourceProvider> sourceProvider, unsigned sourceOffset)
@@ -1343 +1365 @@
 void CodeBlock::derefStructures(Instruction* vPC) const
 {
+    ASSERT(m_codeType != NativeCode);
     Interpreter* interpreter = m_globalData->interpreter;
 
@@ -1388 +1411 @@
 void CodeBlock::refStructures(Instruction* vPC) const
 {
+    ASSERT(m_codeType != NativeCode);
     Interpreter* interpreter = m_globalData->interpreter;
 
@@ -1442 +1466 @@
 void CodeBlock::reparseForExceptionInfoIfNecessary(CallFrame* callFrame)
 {
+    ASSERT(m_codeType != NativeCode);
     if (m_exceptionInfo)
         return;
@@ -1512 +1537 @@
 HandlerInfo* CodeBlock::handlerForBytecodeOffset(unsigned bytecodeOffset)
 {
+    ASSERT(m_codeType != NativeCode);
     ASSERT(bytecodeOffset < m_instructionCount);
 
@@ -1530 +1556 @@
 int CodeBlock::lineNumberForBytecodeOffset(CallFrame* callFrame, unsigned bytecodeOffset)
 {
+    ASSERT(m_codeType != NativeCode);
     ASSERT(bytecodeOffset < m_instructionCount);
 
@@ -1555 +1582 @@
 int CodeBlock::expressionRangeForBytecodeOffset(CallFrame* callFrame, unsigned bytecodeOffset, int& divot, int& startOffset, int& endOffset)
 {
+    ASSERT(m_codeType != NativeCode);
     ASSERT(bytecodeOffset < m_instructionCount);
 
@@ -1594 +1622 @@
 bool CodeBlock::getByIdExceptionInfoForBytecodeOffset(CallFrame* callFrame, unsigned bytecodeOffset, OpcodeID& opcodeID)
 {
+    ASSERT(m_codeType != NativeCode);
     ASSERT(bytecodeOffset < m_instructionCount);
 
@@ -1622 +1651 @@
 bool CodeBlock::functionRegisterForBytecodeOffset(unsigned bytecodeOffset, int& functionRegisterIndex)
 {
+    ASSERT(m_codeType != NativeCode);
     ASSERT(bytecodeOffset < m_instructionCount);
 
@@ -1648 +1678 @@
 bool CodeBlock::hasGlobalResolveInstructionAtBytecodeOffset(unsigned bytecodeOffset)
 {
+    ASSERT(m_codeType != NativeCode);
     if (m_globalResolveInstructions.isEmpty())
         return false;
@@ -1668 +1699 @@
 bool CodeBlock::hasGlobalResolveInfoAtBytecodeOffset(unsigned bytecodeOffset)
 {
+    ASSERT(m_codeType != NativeCode);
     if (m_globalResolveInfos.isEmpty())
         return false;
@@ -1690 +1722 @@
 void CodeBlock::setJITCode(JITCode jitCode)
 {
+    ASSERT(m_codeType != NativeCode); 
     ownerNode()->setJITCode(jitCode);
 #if !ENABLE(OPCODE_SAMPLING)

trunk/JavaScriptCore/bytecode/CodeBlock.h

@@ -50 +50 @@
     class ExecState;
 
-    enum CodeType { GlobalCode, EvalCode, FunctionCode };
+    enum CodeType { GlobalCode, EvalCode, FunctionCode, NativeCode };
 
     static ALWAYS_INLINE int missingThisObjectMarker() { return std::numeric_limits<int>::max(); }
@@ -218 +218 @@
         friend class JIT;
     public:
+        CodeBlock(ScopeNode* ownerNode);
         CodeBlock(ScopeNode* ownerNode, CodeType, PassRefPtr<SourceProvider>, unsigned sourceOffset);
         ~CodeBlock();
@@ -340 +341 @@
         CodeType codeType() const { return m_codeType; }
 
-        SourceProvider* source() const { return m_source.get(); }
-        unsigned sourceOffset() const { return m_sourceOffset; }
+        SourceProvider* source() const { ASSERT(m_codeType != NativeCode); return m_source.get(); }
+        unsigned sourceOffset() const { ASSERT(m_codeType != NativeCode); return m_sourceOffset; }
 
         size_t numberOfJumpTargets() const { return m_jumpTargets.size(); }
@@ -433 +434 @@
         SymbolTable& symbolTable() { return m_symbolTable; }
 
-        EvalCodeCache& evalCodeCache() { createRareDataIfNecessary(); return m_rareData->m_evalCodeCache; }
+        EvalCodeCache& evalCodeCache() { ASSERT(m_codeType != NativeCode); createRareDataIfNecessary(); return m_rareData->m_evalCodeCache; }
 
         void shrinkToFit();
@@ -457 +458 @@
         void createRareDataIfNecessary()
         {
+            ASSERT(m_codeType != NativeCode); 
             if (!m_rareData)
                 m_rareData.set(new RareData);