Changeset 39993 in webkit for trunk/JavaScriptCore/bytecode/SamplingTool.cpp

Timestamp:

Jan 16, 2009, 3:34:46 PM (16 years ago)

Author:

[email protected]

Message:

2009-01-16 Gavin Barraclough <​[email protected]>

Reviewed by Geoff Garen.

Fixes for SamplingTool.

​https://bugs.webkit.org/show_bug.cgi?id=23390

• assembler/MacroAssembler.h: (JSC::MacroAssembler::storePtr):
• bytecode/SamplingTool.cpp: (JSC::SamplingTool::run): (JSC::SamplingTool::dump):
• bytecode/SamplingTool.h: (JSC::SamplingTool::encodeSample):
• jit/JIT.cpp: (JSC::JIT::privateCompileMainPass): (JSC::JIT::privateCompile):
• jit/JIT.h: (JSC::JIT::samplingToolTrackCodeBlock):
• jit/JITCall.cpp: (JSC::JIT::compileOpCall): (JSC::JIT::compileOpCallSlowCase):
• jit/JITInlineMethods.h: (JSC::JIT::emitCTICall_internal):

File:

• trunk/JavaScriptCore/bytecode/SamplingTool.cpp (modified) (3 diffs)

trunk/JavaScriptCore/bytecode/SamplingTool.cpp

@@ -106 +106 @@
 #if ENABLE(CODEBLOCK_SAMPLING)
         MutexLocker locker(m_scopeSampleMapMutex);
-        ScopeSampleRecord* record = m_scopeSampleMap->get(sample.codeBlock()->ownerNode);
+        ScopeSampleRecord* record = m_scopeSampleMap->get(sample.codeBlock()->ownerNode());
         ASSERT(record);
         record->sample(sample.codeBlock(), sample.vPC());
@@ -249 +249 @@
 
         if (blockPercent >= 1) {
-            Instruction* code = codeBlock->instructions().begin();
-            printf("#%d: %s:%d: %d / %lld (%.3f%%)\n", i + 1, record->m_scope->sourceURL().UTF8String().c_str(), codeBlock->lineNumberForBytecodeOffset(0), record->m_sampleCount, m_sampleCount, blockPercent);
+            //Instruction* code = codeBlock->instructions().begin();
+            printf("#%d: %s:%d: %d / %lld (%.3f%%)\n", i + 1, record->m_scope->sourceURL().UTF8String().c_str(), codeBlock->lineNumberForBytecodeOffset(exec, 0), record->m_sampleCount, m_sampleCount, blockPercent);
             if (i < 10) {
                 HashMap<unsigned,unsigned> lineCounts;
@@ -260 +260 @@
                     if (count) {
                         printf("    [% 4d] has sample count: % 4d\n", op, count);
-                        // It is okay to pass 0 as the CallFrame for lineNumberForBytecodeOffset since
-                        // we ensure exception information when Sampling is enabled.
-                        unsigned line = codeBlock->lineNumberForBytecodeOffset(0, op);
+                        unsigned line = codeBlock->lineNumberForBytecodeOffset(exec, op);
                         lineCounts.set(line, (lineCounts.contains(line) ? lineCounts.get(line) : 0) + count);
                     }