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

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.h (modified) (1 diff)

trunk/JavaScriptCore/bytecode/SamplingTool.h

@@ -160 +160 @@
         intptr_t* sampleSlot() { return &m_sample; }
 
-        unsigned encodeSample(Instruction* vPC, bool inCTIFunction = false, bool inHostFunction = false)
+        void* encodeSample(Instruction* vPC, bool inCTIFunction = false, bool inHostFunction = false)
         {
             ASSERT(!(reinterpret_cast<intptr_t>(vPC) & 0x3));
-            return reinterpret_cast<intptr_t>(vPC) | (static_cast<intptr_t>(inCTIFunction) << 1) | static_cast<intptr_t>(inHostFunction);
+            return reinterpret_cast<void*>(reinterpret_cast<intptr_t>(vPC) | (static_cast<intptr_t>(inCTIFunction) << 1) | static_cast<intptr_t>(inHostFunction));
         }