Changeset 34086 in webkit for trunk/JavaScriptCore/kjs/object.cpp

Timestamp:

May 23, 2008, 12:12:31 PM (17 years ago)

Author:

[email protected]

Message:

2008-05-23 Geoffrey Garen <​[email protected]>

Rolled out r34085 because it measured as a 7.6% performance regression.

File:

• trunk/JavaScriptCore/kjs/object.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/object.cpp

@@ -92 +92 @@
   }
 #endif
-  JSValue* ret = callAsFunction(exec,thisObj,args); 
-
+    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;