Changeset 34086 in webkit for trunk/JavaScriptCore/profiler/Profiler.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/profiler/Profiler.cpp (modified) (5 diffs)

trunk/JavaScriptCore/profiler/Profiler.cpp

@@ -99 +99 @@
 }
 
+static inline bool shouldExcludeFunction(ExecState* exec, JSObject* calledFunction)
+{
+    if (!calledFunction->inherits(&InternalFunctionImp::info))
+        return false;
+    // Don't record a call for function.call and function.apply.
+    if (static_cast<InternalFunctionImp*>(calledFunction)->functionName() == exec->propertyNames().call)
+        return true;
+    if (static_cast<InternalFunctionImp*>(calledFunction)->functionName() == exec->propertyNames().apply)
+        return true;
+    return false;
+}
+
 static inline void dispatchFunctionToProfiles(const Vector<RefPtr<Profile> >& profiles, Profile::ProfileFunction function, const CallIdentifier& callIdentifier, unsigned currentPageGroupIdentifier)
 {
@@ -108 +120 @@
 void Profiler::willExecute(ExecState* exec, JSObject* calledFunction)
 {
-    ASSERT(!m_currentProfiles.isEmpty());
+    if (m_currentProfiles.isEmpty())
+        return;
+
+    if (shouldExcludeFunction(exec, calledFunction))
+        return;
 
     dispatchFunctionToProfiles(m_currentProfiles, &Profile::willExecute, createCallIdentifier(calledFunction), exec->lexicalGlobalObject()->pageGroupIdentifier());
@@ -115 +131 @@
 void Profiler::willExecute(ExecState* exec, const UString& sourceURL, int startingLineNumber)
 {
-    ASSERT(!m_currentProfiles.isEmpty());
+    if (m_currentProfiles.isEmpty())
+        return;
 
     CallIdentifier callIdentifier = createCallIdentifier(sourceURL, startingLineNumber);
@@ -124 +141 @@
 void Profiler::didExecute(ExecState* exec, JSObject* calledFunction)
 {
-    ASSERT(!m_currentProfiles.isEmpty());
+    if (m_currentProfiles.isEmpty())
+        return;
+
+    if (shouldExcludeFunction(exec, calledFunction))
+        return;
 
     dispatchFunctionToProfiles(m_currentProfiles, &Profile::didExecute, createCallIdentifier(calledFunction), exec->lexicalGlobalObject()->pageGroupIdentifier());
@@ -131 +152 @@
 void Profiler::didExecute(ExecState* exec, const UString& sourceURL, int startingLineNumber)
 {
-    ASSERT(!m_currentProfiles.isEmpty());
+    if (m_currentProfiles.isEmpty())
+        return;
 
     dispatchFunctionToProfiles(m_currentProfiles, &Profile::didExecute, createCallIdentifier(sourceURL, startingLineNumber), exec->lexicalGlobalObject()->pageGroupIdentifier());