Changeset 34086 in webkit for trunk/JavaScriptCore/VM/Machine.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/VM/Machine.cpp (modified) (9 diffs)

trunk/JavaScriptCore/VM/Machine.cpp

@@ -438 +438 @@
 }
 
-static NEVER_INLINE JSValue* callEval(ExecState* exec, JSObject* thisObj, JSObject* evalFunction, ScopeChainNode* scopeChain, RegisterFile* registerFile, Register* r, int argv, int argc, JSValue*& exceptionValue)
+static NEVER_INLINE JSValue* callEval(ExecState* exec, JSObject* thisObj, ScopeChainNode* scopeChain, RegisterFile* registerFile, Register* r, int argv, int argc, JSValue*& exceptionValue)
 {
     Profiler** profiler = Profiler::enabledProfilerReference();
+    JSObject* evalFunction = scopeChain->globalObject()->evalFunction();
     if (*profiler)
         (*profiler)->willExecute(exec, evalFunction);
@@ -576 +577 @@
     }
 
-    Register* callFrame = r - oldCodeBlock->numLocals - CallFrameHeaderSize;
-    
-    if (Profiler* profiler = *Profiler::enabledProfilerReference()) {
-        if (!isGlobalCallFrame(registerBase, r) && callFrame[Callee].u.jsObject) // Check for global and eval code
-            profiler->didExecute(exec, callFrame[Callee].u.jsObject);
-        else
-            profiler->didExecute(exec, codeBlock->ownerNode->sourceURL(), codeBlock->ownerNode->lineNo());
-    }
-
     if (oldCodeBlock->needsFullScopeChain)
         scopeChain->deref();
@@ -591 +583 @@
         return false;
 
+    Register* callFrame = r - oldCodeBlock->numLocals - CallFrameHeaderSize;
+    
     codeBlock = callFrame[CallerCodeBlock].u.codeBlock;
     if (!codeBlock)
@@ -608 +602 @@
     vPC = callFrame[ReturnVPC].u.vPC;
 
+    if (Profiler* profiler = *Profiler::enabledProfilerReference())
+        profiler->didExecute(exec, callFrame[Callee].u.jsObject);
     return true;
 }
@@ -673 +669 @@
         scopeChain = scopeChain->copy();
 
-    ExecState newExec(exec, this, registerFile, scopeChain, -1);
-
     Profiler** profiler = Profiler::enabledProfilerReference();
     if (*profiler)
         (*profiler)->willExecute(exec, programNode->sourceURL(), programNode->lineNo());
+
+    ExecState newExec(exec, this, registerFile, scopeChain, -1);
 
     m_reentryDepth++;
@@ -743 +739 @@
     JSValue* result = privateExecute(Normal, &newExec, registerFile, r, scopeChain, newCodeBlock, exception);
     m_reentryDepth--;
+
+    if (*profiler)
+        (*profiler)->didExecute(exec, function);
 
     registerFile->shrink(oldSize);
@@ -1866 +1865 @@
             registerFile->setSafeForReentry(true);
 
-            JSValue* result = callEval(exec, thisObject, static_cast<JSObject*>(funcVal), scopeChain, registerFile, r, argv, argc, exceptionValue);
+            JSValue* result = callEval(exec, thisObject, scopeChain, registerFile, r, argv, argc, exceptionValue);
 
             registerFile->setSafeForReentry(false);
@@ -1976 +1975 @@
             activation->copyRegisters();
         }
-
-        if (*enabledProfilerReference)
-            (*enabledProfilerReference)->didExecute(exec, callFrame[Callee].u.jsObject);
 
         if (codeBlock->needsFullScopeChain)
@@ -2000 +1996 @@
         int r0 = callFrame[ReturnValueRegister].u.i;
         r[r0].u.jsValue = returnValue;
+
+        if (*enabledProfilerReference)
+            (*enabledProfilerReference)->didExecute(exec, callFrame[Callee].u.jsObject);
 
         NEXT_OPCODE;