Changeset 34090 in webkit for trunk/JavaScriptCore/VM/Machine.cpp

Timestamp:

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

Author:

[email protected]

Message:

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

Rolling back in r34085, with performance resolved.

Apparently, passing the eval function to callEval gave GCC a hernia.

Reviewed by Darin Adler, Kevin McCullough, and Oliver Hunt.

Fixed <rdar://problem/5959447> Crashes and incorrect reporting in the
JavaScript profiler

• VM/Machine.cpp: (KJS::callEval): Made this profiler hooks slightly faster by passing in the eval function.

(KJS::Machine::unwindCallFrame): Fixed incorrect reporting / a crash
when unwinding from inside eval and/or program code: detect the
difference, and do the right thing. Also, be sure to notify the profiler
*before* deref'ing the scope chain, since the profiler uses the scope chain.

(KJS::Machine::execute): Fixed incorrect reporting / crash when calling
a JS function re-entrently: Machine::execute(FunctionBodyNode*...)
should not invoke the didExecute hook, because op_ret already does that.
Also, use the new function's ExecState when calling out to the profiler.
(Not important now, but could have become a subtle bug later.)

(KJS::Machine::privateExecute): Fixed a hard to reproduce crash when
profiling JS functions: notify the profiler *before* deref'ing the scope
chain, since the profiler uses the scope chain.

• kjs/object.cpp: (KJS::JSObject::call): Removed these hooks, because they are now unnecessary.

• profiler/Profile.cpp: Added a comment to explain a subtlety that only Kevin and I understood previously. (Now, the whole world can understand!)

• profiler/Profiler.cpp: (KJS::shouldExcludeFunction): Don't exclude .call and .apply. That was a hack to fix bugs that no longer exist.

Finally, sped things up a little bit by changing the "Is the profiler
running?" check into an ASSERT, since we only call into the profiler
when it's running:

(KJS::Profiler::willExecute):
(KJS::Profiler::didExecute):

File:

• trunk/JavaScriptCore/VM/Machine.cpp (modified) (9 diffs)

trunk/JavaScriptCore/VM/Machine.cpp

@@ -441 +441 @@
 {
     Profiler** profiler = Profiler::enabledProfilerReference();
-    JSObject* evalFunction = scopeChain->globalObject()->evalFunction();
     if (*profiler)
-        (*profiler)->willExecute(exec, evalFunction);
+        (*profiler)->willExecute(exec, scopeChain->globalObject()->evalFunction());
 
     JSValue* x = argc >= 2 ? r[argv + 1].u.jsValue : jsUndefined();
@@ -470 +469 @@
 
     if ((*profiler))
-        (*profiler)->didExecute(exec, evalFunction);
+        (*profiler)->didExecute(exec, scopeChain->globalObject()->evalFunction());
 
     return result;
@@ -577 +576 @@
     }
 
+    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();
@@ -583 +591 @@
         return false;
 
-    Register* callFrame = r - oldCodeBlock->numLocals - CallFrameHeaderSize;
-    
     codeBlock = callFrame[CallerCodeBlock].u.codeBlock;
     if (!codeBlock)
@@ -602 +608 @@
     vPC = callFrame[ReturnVPC].u.vPC;
 
-    if (Profiler* profiler = *Profiler::enabledProfilerReference())
-        profiler->didExecute(exec, callFrame[Callee].u.jsObject);
     return true;
 }
@@ -669 +673 @@
         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++;
@@ -739 +743 @@
     JSValue* result = privateExecute(Normal, &newExec, registerFile, r, scopeChain, newCodeBlock, exception);
     m_reentryDepth--;
-
-    if (*profiler)
-        (*profiler)->didExecute(exec, function);
 
     registerFile->shrink(oldSize);
@@ -1976 +1977 @@
         }
 
+        if (*enabledProfilerReference)
+            (*enabledProfilerReference)->didExecute(exec, callFrame[Callee].u.jsObject);
+
         if (codeBlock->needsFullScopeChain)
             scopeChain->deref();
@@ -1996 +2000 @@
         int r0 = callFrame[ReturnValueRegister].u.i;
         r[r0].u.jsValue = returnValue;
-
-        if (*enabledProfilerReference)
-            (*enabledProfilerReference)->didExecute(exec, callFrame[Callee].u.jsObject);
 
         NEXT_OPCODE;