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

Timestamp:

May 26, 2008, 11:50:55 AM (17 years ago)

Author:

[email protected]

Message:

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

Reviewed by Darin Adler.

Fixed <rdar://problem/5960859> After an eval of a non-string or a syntax
error, all profile stack frames are incorrect

SunSpider reports a .3% speedup, possibly because eval of a string is a
little more efficient now.

• VM/Machine.cpp: (KJS::callEval): Make sure to call didExecute when returning early. I simplified this function to remove one early return, making the job of adding special code to early returns easier.

(KJS::Machine::execute): Use the new function ExecState when notifying
the profiler. (This doesn't change behavior now, but it might lead to
subtle errors in the future.)

File:

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

trunk/JavaScriptCore/VM/Machine.cpp

@@ -440 +440 @@
 static NEVER_INLINE JSValue* callEval(ExecState* exec, JSObject* thisObj, ScopeChainNode* scopeChain, RegisterFile* registerFile, Register* r, int argv, int argc, JSValue*& exceptionValue)
 {
+    if (argc < 2)
+        return jsUndefined();
+
+    JSValue* program = r[argv + 1].u.jsValue;
+    
+    if (!program->isString())
+        return program;
+    
     Profiler** profiler = Profiler::enabledProfilerReference();
     if (*profiler)
         (*profiler)->willExecute(exec, scopeChain->globalObject()->evalFunction());
 
-    JSValue* x = argc >= 2 ? r[argv + 1].u.jsValue : jsUndefined();
-    
-    if (!x->isString())
-        return x;
-    
-    UString s = x->toString(exec);
-    if (exec->hadException()) {
-        exceptionValue = exec->exception();
-        exec->clearException();
-        return 0;
-    }
-
     int sourceId;
     int errLine;
     UString errMsg;
-    RefPtr<EvalNode> evalNode = parser().parse<EvalNode>(exec, UString(), 0, UStringSourceProvider::create(s), &sourceId, &errLine, &errMsg);
+    RefPtr<EvalNode> evalNode = parser().parse<EvalNode>(exec, UString(), 0, UStringSourceProvider::create(static_cast<StringImp*>(program)->value()), &sourceId, &errLine, &errMsg);
     
     if (!evalNode) {
         exceptionValue = Error::create(exec, SyntaxError, errMsg, errLine, sourceId, NULL);
+        if (*profiler)
+            (*profiler)->didExecute(exec, scopeChain->globalObject()->evalFunction());
         return 0;
     }
@@ -468 +466 @@
     JSValue* result = machine().execute(evalNode.get(), exec, thisObj, registerFile, r - (*registerFile->basePointer()) + argv + argc, scopeChain, &exceptionValue);
 
-    if ((*profiler))
+    if (*profiler)
         (*profiler)->didExecute(exec, scopeChain->globalObject()->evalFunction());
 
@@ -795 +793 @@
         scopeChain = scopeChain->copy();
 
+    ExecState newExec(exec, this, registerFile, scopeChain, -1);
+
     Profiler** profiler = Profiler::enabledProfilerReference();
     if (*profiler)
         (*profiler)->willExecute(exec, evalNode->sourceURL(), evalNode->lineNo());
-
-    ExecState newExec(exec, this, registerFile, scopeChain, -1);
 
     m_reentryDepth++;