Changeset 81525 in webkit for trunk/Source/JavaScriptCore/profiler/Profiler.h

Timestamp:

Mar 18, 2011, 4:07:16 PM (14 years ago)

Author:

[email protected]

Message:

2011-03-18 Geoffrey Garen <​[email protected]>

Reviewed by Oliver Hunt.

[GTK] JSC crashes in 32bit Release bots after r80743
​https://bugs.webkit.org/show_bug.cgi?id=56180

The crash was caused by referencing GC memory from a GC destructor. This
is not safe because destruction time / order is not guaranteed.

• profiler/ProfileGenerator.cpp: (JSC::ProfileGenerator::create): (JSC::ProfileGenerator::ProfileGenerator): (JSC::ProfileGenerator::willExecute): (JSC::ProfileGenerator::didExecute):
• profiler/ProfileGenerator.h: (JSC::ProfileGenerator::origin): Made ExecState* the first argument, to match the rest of this class and JSC.

Use a JSGlobalObject* instead of an ExecState* with an indirect reference
to a JSGlobalObject* to track our origin. This is simpler and more
efficient, and it removes the destruction order dependency that was causing
our crash.

• profiler/Profiler.cpp: (JSC::Profiler::startProfiling): Updated for change to JSGlobalObject*. (JSC::Profiler::stopProfiling): New function for stopping all profiles for a given global object. This is more straight-forward than multiplexing through the old function.

(JSC::dispatchFunctionToProfiles): Updated for change to JSGlobalObject*.

• profiler/Profiler.h: Ditto.

• runtime/JSGlobalObject.cpp: (JSC::JSGlobalObject::~JSGlobalObject): Ditto.

File:

• trunk/Source/JavaScriptCore/profiler/Profiler.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/profiler/Profiler.h

@@ -39 +39 @@
     class ExecState;
     class JSGlobalData;
+    class JSGlobalObject;
     class JSObject;
     class JSValue;
@@ -58 +59 @@
         void startProfiling(ExecState*, const UString& title);
         PassRefPtr<Profile> stopProfiling(ExecState*, const UString& title);
+        void stopProfiling(JSGlobalObject*);
 
         void willExecute(ExecState* callerCallFrame, JSValue function);