Changeset 89973 in webkit

Timestamp:

Jun 28, 2011 4:26:54 PM (13 years ago)

Author:

oliver@apple.com

Message:

2011-06-28 Oliver Hunt <​oliver@apple.com>

Reviewed by Gavin Barraclough.

Fix sampling build
​https://bugs.webkit.org/show_bug.cgi?id=63579

Gets opcode sampling building again, doesn't seem to work alas

• bytecode/SamplingTool.cpp: (JSC::SamplingTool::notifyOfScope):
• bytecode/SamplingTool.h: (JSC::SamplingTool::SamplingTool):
• interpreter/Interpreter.cpp: (JSC::Interpreter::enableSampler):
• runtime/Executable.h: (JSC::ScriptExecutable::ScriptExecutable):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecode/SamplingTool.cpp (modified) (1 diff)
• bytecode/SamplingTool.h (modified) (2 diffs)
• interpreter/Interpreter.cpp (modified) (1 diff)
• runtime/Executable.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-06-28  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Gavin Barraclough.
+
+        Fix sampling build
+        https://bugs.webkit.org/show_bug.cgi?id=63579
+
+        Gets opcode sampling building again, doesn't seem to work alas
+
+        * bytecode/SamplingTool.cpp:
+        (JSC::SamplingTool::notifyOfScope):
+        * bytecode/SamplingTool.h:
+        (JSC::SamplingTool::SamplingTool):
+        * interpreter/Interpreter.cpp:
+        (JSC::Interpreter::enableSampler):
+        * runtime/Executable.h:
+        (JSC::ScriptExecutable::ScriptExecutable):
+
 2011-06-28  Cary Clark  <caryclark@google.com>
 

trunk/Source/JavaScriptCore/bytecode/SamplingTool.cpp

@@ -210 +210 @@
 }
 
-void SamplingTool::notifyOfScope(ScriptExecutable* script)
+void SamplingTool::notifyOfScope(JSGlobalData& globalData, ScriptExecutable* script)
 {
 #if ENABLE(CODEBLOCK_SAMPLING)
     MutexLocker locker(m_scriptSampleMapMutex);
-    m_scopeSampleMap->set(script, new ScriptSampleRecord(script));
+    m_scopeSampleMap->set(script, new ScriptSampleRecord(globalData, script));
 #else
+    UNUSED_PARAM(globalData);
     UNUSED_PARAM(script);
 #endif

trunk/Source/JavaScriptCore/bytecode/SamplingTool.h

@@ -202 +202 @@
             , m_opcodeSampleCount(0)
 #if ENABLE(CODEBLOCK_SAMPLING)
-            , m_scopeSampleMap(new ScriptSampleRecordMap())
+            , m_scopeSampleMap(adoptPtr(new ScriptSampleRecordMap()))
 #endif
         {
@@ -219 +219 @@
         void dump(ExecState*);
 
-        void notifyOfScope(ScriptExecutable* scope);
+        void notifyOfScope(JSGlobalData&, ScriptExecutable* scope);
 
         void sample(CodeBlock* codeBlock, Instruction* vPC)

trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

@@ -4961 +4961 @@
 #if ENABLE(OPCODE_SAMPLING)
     if (!m_sampler) {
-        m_sampler.set(new SamplingTool(this));
+        m_sampler = adoptPtr(new SamplingTool(this));
         m_sampler->setup();
     }

trunk/Source/JavaScriptCore/runtime/Executable.h

@@ -170 +170 @@
         {
 #if ENABLE(CODEBLOCK_SAMPLING)
-            relaxAdoptionRequirement();
             if (SamplingTool* sampler = globalData->interpreter->sampler())
-                sampler->notifyOfScope(this);
+                sampler->notifyOfScope(*globalData, this);
 #else
             UNUSED_PARAM(globalData);
@@ -184 +183 @@
         {
 #if ENABLE(CODEBLOCK_SAMPLING)
-            relaxAdoptionRequirement();
             if (SamplingTool* sampler = exec->globalData().interpreter->sampler())
-                sampler->notifyOfScope(this);
+                sampler->notifyOfScope(exec->globalData(), this);
 #else
             UNUSED_PARAM(exec);