Changeset 43105 in webkit for trunk/JavaScriptCore

Timestamp:

Apr 30, 2009, 4:55:11 PM (16 years ago)

Author:

[email protected]

Message:

2009-04-30 Gavin Barraclough <​[email protected]>

Reviewed by Oliver Hunt.

OPCODE_SAMPLING without CODEBLOCK_SAMPLING is currently broken,
since SamplingTool::Sample::isNull() checks the m_codeBlock
member (which is always null without CODEBLOCK_SAMPLING).

Restructure the checks so make this work again.

• bytecode/SamplingTool.cpp: (JSC::SamplingTool::doRun):
• bytecode/SamplingTool.h: (JSC::SamplingTool::Sample::isNull):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecode/SamplingTool.cpp (modified) (1 diff)
• bytecode/SamplingTool.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-04-30  Gavin Barraclough  <[email protected]>
+
+        Reviewed by Oliver Hunt.
+
+        OPCODE_SAMPLING without CODEBLOCK_SAMPLING is currently broken,
+        since SamplingTool::Sample::isNull() checks the m_codeBlock
+        member (which is always null without CODEBLOCK_SAMPLING).
+
+        Restructure the checks so make this work again.
+
+        * bytecode/SamplingTool.cpp:
+        (JSC::SamplingTool::doRun):
+        * bytecode/SamplingTool.h:
+        (JSC::SamplingTool::Sample::isNull):
+
 2009-04-30  Maciej Stachowiak  <[email protected]>
 

trunk/JavaScriptCore/bytecode/SamplingTool.cpp

@@ -196 +196 @@
 
 #if ENABLE(CODEBLOCK_SAMPLING)
-    MutexLocker locker(m_scopeSampleMapMutex);
-    ScopeSampleRecord* record = m_scopeSampleMap->get(sample.codeBlock()->ownerNode());
-    ASSERT(record);
-    record->sample(sample.codeBlock(), sample.vPC());
+    if (CodeBlock* codeBlock = sample.codeBlock()) {
+        MutexLocker locker(m_scopeSampleMapMutex);
+        ScopeSampleRecord* record = m_scopeSampleMap->get(codeBlock->ownerNode());
+        ASSERT(record);
+        record->sample(codeBlock, sample.vPC());
+    }
 #endif
 }

trunk/JavaScriptCore/bytecode/SamplingTool.h

@@ -235 +235 @@
             }
             
-            bool isNull() { return !m_sample || !m_codeBlock; }
+            bool isNull() { return !m_sample; }
             CodeBlock* codeBlock() { return m_codeBlock; }
             Instruction* vPC() { return reinterpret_cast<Instruction*>(m_sample & ~0x3); }