Changeset 34074 in webkit for trunk/JavaScriptCore

Timestamp:

May 23, 2008, 4:37:32 AM (17 years ago)

Author:

[email protected]

Message:

Fix call stack reported by profiler when entering event handlers.

Reviewed by Tim H

JSObject::call was arbitrarily notifying the profiler when it was
called, even if it was JS code, which notifies the profile on entry
in any case.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/object.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-05-23  Oliver Hunt  <[email protected]>
+
+        Reviewed by Tim H.
+
+        Fix call stack reported by profiler when entering event handlers.
+
+        JSObject::call was arbitrarily notifying the profiler when it was
+        called, even if it was JS code, which notifies the profile on entry
+        in any case.
+
+        * kjs/object.cpp:
+        (KJS::JSObject::call):
+
 2008-05-23  Maciej Stachowiak  <[email protected]>
 

trunk/JavaScriptCore/kjs/object.cpp

@@ -92 +92 @@
   }
 #endif
-
-    Profiler::profiler()->willExecute(exec, this);
-  
-    JSValue *ret = callAsFunction(exec,thisObj,args); 
-
-    Profiler::profiler()->didExecute(exec, this);
-
+    CallData data;
+    JSValue *ret;
+    if (this->getCallData(data) == CallTypeJS) {
+        // A native function will enter the VM, which will allow the profiler 
+        // to detect entry
+        ret = callAsFunction(exec,thisObj,args); 
+    } else {
+        Profiler** profiler = Profiler::enabledProfilerReference();
+        if (*profiler)
+            (*profiler)->willExecute(exec, this);
+        
+        ret = callAsFunction(exec,thisObj,args); 
+        
+        if (*profiler)
+            (*profiler)->didExecute(exec, this);
+    }
 #if KJS_MAX_STACK > 0
   --depth;