Changeset 150690 in webkit

Timestamp:

May 25, 2013 1:17:29 PM (11 years ago)

Author:

mark.lam@apple.com

Message:

Remove Interpreter::retrieveLastCaller().
​https://bugs.webkit.org/show_bug.cgi?id=116753.

Reviewed by Geoffrey Garen.

This is part of the refactoring effort to get rid of functions walking
the JS stack in their own way.

../JavaScriptCore:

• API/JSContextRef.cpp:

(JSContextCreateBacktrace):

• interpreter/CallFrame.cpp:
• interpreter/Interpreter.cpp:

(JSC::Interpreter::Interpreter):
(JSC::Interpreter::getStackTrace):
(JSC::Interpreter::addStackTraceIfNecessary):

• interpreter/Interpreter.h:

(StackFrame):
(JSC::StackFrame::StackFrame):
(Interpreter):

• jsc.cpp:

(functionJSCStack):

• profiler/ProfileGenerator.cpp:

(JSC::ProfileGenerator::addParentForConsoleStart):

../WebCore:

No new tests.

• bindings/js/JSXMLHttpRequestCustom.cpp:

(WebCore::JSXMLHttpRequest::send):

• bindings/js/ScriptCallStackFactory.cpp:

(WebCore::createScriptCallStack):

Location:

branches/dfgFourthTier/Source

Files:

• JavaScriptCore/API/JSContextRef.cpp (modified) (1 diff)
• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/interpreter/CallFrame.cpp (modified) (1 diff)
• JavaScriptCore/interpreter/Interpreter.cpp (modified) (4 diffs)
• JavaScriptCore/interpreter/Interpreter.h (modified) (4 diffs)
• JavaScriptCore/jsc.cpp (modified) (1 diff)
• JavaScriptCore/profiler/ProfileGenerator.cpp (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/js/JSXMLHttpRequestCustom.cpp (modified) (1 diff)
• WebCore/bindings/js/ScriptCallStackFactory.cpp (modified) (2 diffs)

branches/dfgFourthTier/Source/JavaScriptCore/API/JSContextRef.cpp

@@ -179 +179 @@
     unsigned count = 0;
     StringBuilder builder;
-    CallFrame* callFrame = exec;
-    String functionName;
-    if (exec->callee()) {
-        if (asObject(exec->callee())->inherits(&InternalFunction::s_info)) {
-            functionName = asInternalFunction(exec->callee())->name(exec);
-            builder.appendLiteral("#0 ");
-            builder.append(functionName);
-            builder.appendLiteral("() ");
-            count++;
-        }
-    }
-    while (true) {
-        RELEASE_ASSERT(callFrame);
-        int signedLineNumber;
-        intptr_t sourceID;
-        String urlString;
-        JSValue function;
-
-        exec->interpreter()->retrieveLastCaller(callFrame, signedLineNumber, sourceID, urlString, function);
-
-        if (function)
-            functionName = jsCast<JSFunction*>(function)->name(exec);
-        else {
-            // Caller is unknown, but if frame is empty we should still add the frame, because
-            // something called us, and gave us arguments.
-            if (count)
-                break;
-        }
-        unsigned lineNumber = signedLineNumber >= 0 ? signedLineNumber : 0;
+    Vector<StackFrame> stackTrace;
+    exec->interpreter()->getStackTrace(stackTrace, maxStackSize);
+    maxStackSize = stackTrace.size();
+    for (size_t i = 0; i < maxStackSize; i++) {
         if (!builder.isEmpty())
             builder.append('\n');
         builder.append('#');
-        builder.appendNumber(count);
+        builder.appendNumber(count++);
         builder.append(' ');
-        builder.append(functionName);
+        builder.append(stackTrace[i].friendlyFunctionName(exec));
         builder.appendLiteral("() at ");
-        builder.append(urlString);
+        builder.append(stackTrace[i].friendlySourceURL());
         builder.append(':');
-        builder.appendNumber(lineNumber);
-        if (!function || ++count == maxStackSize)
-            break;
-        callFrame = callFrame->callerFrame();
-    }
+        builder.appendNumber(stackTrace[i].friendlyLineNumber());
+    }
+
     return OpaqueJSString::create(builder.toString()).leakRef();
 }

branches/dfgFourthTier/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-05-25  Mark Lam  <mark.lam@apple.com>
+
+        Remove Interpreter::retrieveLastCaller().
+        https://bugs.webkit.org/show_bug.cgi?id=116753.
+
+        Reviewed by Geoffrey Garen.
+
+        This is part of the refactoring effort to get rid of functions walking
+        the JS stack in their own way.
+
+        * API/JSContextRef.cpp:
+        (JSContextCreateBacktrace):
+        * interpreter/CallFrame.cpp:
+        * interpreter/Interpreter.cpp:
+        (JSC::Interpreter::Interpreter):
+        (JSC::Interpreter::getStackTrace):
+        (JSC::Interpreter::addStackTraceIfNecessary):
+        * interpreter/Interpreter.h:
+        (StackFrame):
+        (JSC::StackFrame::StackFrame):
+        (Interpreter):
+        * jsc.cpp:
+        (functionJSCStack):
+        * profiler/ProfileGenerator.cpp:
+        (JSC::ProfileGenerator::addParentForConsoleStart):
+
 2013-05-24  Filip Pizlo  <fpizlo@apple.com>
 

branches/dfgFourthTier/Source/JavaScriptCore/interpreter/CallFrame.cpp

@@ -34 +34 @@
 
 #ifndef NDEBUG
-void CallFrame::dumpCaller()
-{
-    int signedLineNumber;
-    intptr_t sourceID;
-    String urlString;
-    JSValue function;
-    
-    interpreter()->retrieveLastCaller(this, signedLineNumber, sourceID, urlString, function);
-    dataLogF("Callpoint => %s:%d\n", urlString.utf8().data(), signedLineNumber);
-}
-
 JSStack* CallFrame::stack()
 {

branches/dfgFourthTier/Source/JavaScriptCore/interpreter/Interpreter.cpp

@@ -340 +340 @@
 Interpreter::Interpreter(VM& vm)
     : m_sampleEntryDepth(0)
+    , m_vm(vm)
     , m_stack(vm)
     , m_errorHandlingModeReentry(0)
@@ -685 +686 @@
 }
 
-void Interpreter::getStackTrace(VM* vm, Vector<StackFrame>& results)
-{
-    CallFrame* callFrame = vm->topCallFrame->removeHostCallFrameFlag();
+void Interpreter::getStackTrace(Vector<StackFrame>& results, unsigned maxStackSize)
+{
+    VM& vm = m_vm;
+    CallFrame* callFrame = vm.topCallFrame->removeHostCallFrameFlag();
     if (!callFrame || callFrame == CallFrame::noCaller()) 
         return;
-    int line = getLineNumberForCallFrame(vm, callFrame);
+    int line = getLineNumberForCallFrame(&vm, callFrame);
 
     callFrame = callFrame->trueCallFrameFromVMCode();
 
-    while (callFrame && callFrame != CallFrame::noCaller()) {
+    while (callFrame && callFrame != CallFrame::noCaller() && maxStackSize--) {
         String sourceURL;
         if (callFrame->codeBlock()) {
             sourceURL = getSourceURLFromCallFrame(callFrame);
-            StackFrame s = { Strong<JSObject>(*vm, callFrame->callee()), getStackFrameCodeType(callFrame), Strong<ExecutableBase>(*vm, callFrame->codeBlock()->ownerExecutable()), line, sourceURL};
+            StackFrame s(Strong<JSObject>(vm, callFrame->callee()), getStackFrameCodeType(callFrame), Strong<ExecutableBase>(vm, callFrame->codeBlock()->ownerExecutable()), line, sourceURL);
             results.append(s);
         } else {
-            StackFrame s = { Strong<JSObject>(*vm, callFrame->callee()), StackFrameNativeCode, Strong<ExecutableBase>(), -1, String()};
+            StackFrame s(Strong<JSObject>(vm, callFrame->callee()), StackFrameNativeCode, Strong<ExecutableBase>(), -1, String());
             results.append(s);
         }
         unsigned unusedBytecodeOffset = 0;
-        callFrame = getCallerInfo(vm, callFrame, line, unusedBytecodeOffset);
+        callFrame = getCallerInfo(&vm, callFrame, line, unusedBytecodeOffset);
     }
 }
@@ -717 +719 @@
 
     Vector<StackFrame> stackTrace;
-    getStackTrace(&callFrame->vm(), stackTrace);
+    vm->interpreter->getStackTrace(stackTrace);
     
     if (stackTrace.isEmpty())
@@ -1414 +1416 @@
 }
 
-void Interpreter::retrieveLastCaller(CallFrame* callFrame, int& lineNumber, intptr_t& sourceID, String& sourceURL, JSValue& function) const
-{
-    function = JSValue();
-    lineNumber = -1;
-    sourceURL = String();
-
-    CallFrame* callerFrame = callFrame->callerFrame();
-    if (callerFrame->hasHostCallFrameFlag())
-        return;
-
-    CodeBlock* callerCodeBlock = callerFrame->codeBlock();
-    if (!callerCodeBlock)
-        return;
-    unsigned bytecodeOffset = 0;
-    bytecodeOffset = callerCodeBlock->bytecodeOffset(callerFrame, callFrame->returnPC());
-    lineNumber = callerCodeBlock->lineNumberForBytecodeOffset(bytecodeOffset - 1);
-    sourceID = callerCodeBlock->ownerExecutable()->sourceID();
-    sourceURL = callerCodeBlock->ownerExecutable()->sourceURL();
-    function = callerFrame->callee();
-}
-
 CallFrame* Interpreter::findFunctionCallFrameFromVMCode(CallFrame* callFrame, JSFunction* function)
 {

branches/dfgFourthTier/Source/JavaScriptCore/interpreter/Interpreter.h

@@ -82 +82 @@
         int line;
         String sourceURL;
+
+        StackFrame()
+            : codeType(StackFrameNativeCode)
+            , line(0)
+        {
+        }
+
+        StackFrame(Strong<JSObject> otherCallee, StackFrameCodeType otherCodeType, Strong<ExecutableBase> otherExecutable, int otherLine, String otherSourceURL)
+            : callee(otherCallee)
+            , codeType(otherCodeType)
+            , executable(otherExecutable)
+            , line(otherLine)
+            , sourceURL(otherSourceURL)
+        {
+        }
+
         String toString(CallFrame* callFrame) const
         {
@@ -224 +240 @@
         JSValue retrieveArgumentsFromVMCode(CallFrame*, JSFunction*) const;
         JSValue retrieveCallerFromVMCode(CallFrame*, JSFunction*) const;
-        JS_EXPORT_PRIVATE void retrieveLastCaller(CallFrame*, int& lineNumber, intptr_t& sourceID, String& sourceURL, JSValue& function) const;
         
         void getArgumentsData(CallFrame*, JSFunction*&, ptrdiff_t& firstParameterIndex, Register*& argv, int& argc);
@@ -233 +248 @@
         NEVER_INLINE void debug(CallFrame*, DebugHookID, int firstLine, int lastLine, int charPosition);
         static const String getTraceLine(CallFrame*, StackFrameCodeType, const String&, int);
-        JS_EXPORT_PRIVATE static void getStackTrace(VM*, Vector<StackFrame>& results);
+        JS_EXPORT_PRIVATE void getStackTrace(Vector<StackFrame>& results, unsigned maxStackSize = UINT_MAX);
         static void addStackTraceIfNecessary(CallFrame*, JSObject* error);
 
@@ -271 +286 @@
         OwnPtr<SamplingTool> m_sampler;
 
+        VM& m_vm;
         JSStack m_stack;
         int m_errorHandlingModeReentry;

branches/dfgFourthTier/Source/JavaScriptCore/jsc.cpp

@@ -328 +328 @@
 
     Vector<StackFrame> stackTrace;
-    Interpreter::getStackTrace(&exec->vm(), stackTrace);
+    exec->interpreter()->getStackTrace(stackTrace);
     int i = 0;
 

branches/dfgFourthTier/Source/JavaScriptCore/profiler/ProfileGenerator.cpp

@@ -59 +59 @@
 void ProfileGenerator::addParentForConsoleStart(ExecState* exec)
 {
-    int lineNumber;
-    intptr_t sourceID;
-    String sourceURL;
-    JSValue function;
+    Vector<StackFrame> stackTrace;
+    exec->interpreter()->getStackTrace(stackTrace, 2);
 
-    exec->interpreter()->retrieveLastCaller(exec, lineNumber, sourceID, sourceURL, function);
-    m_currentNode = ProfileNode::create(exec, LegacyProfiler::createCallIdentifier(exec, function, sourceURL, lineNumber), m_head.get(), m_head.get());
+    m_currentNode = ProfileNode::create(exec, LegacyProfiler::createCallIdentifier(exec, stackTrace[1].callee.get(), stackTrace[1].sourceURL, stackTrace[1].line), m_head.get(), m_head.get());
     m_head->insertNode(m_currentNode.get());
 }

branches/dfgFourthTier/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-25  Mark Lam  <mark.lam@apple.com>
+
+        Remove Interpreter::retrieveLastCaller().
+        https://bugs.webkit.org/show_bug.cgi?id=116753.
+
+        Reviewed by Geoffrey Garen.
+
+        This is part of the refactoring effort to get rid of functions walking
+        the JS stack in their own way.
+
+        No new tests.
+
+        * bindings/js/JSXMLHttpRequestCustom.cpp:
+        (WebCore::JSXMLHttpRequest::send):
+        * bindings/js/ScriptCallStackFactory.cpp:
+        (WebCore::createScriptCallStack):
+
 2013-05-06  Geoffrey Garen  <ggaren@apple.com>
 

branches/dfgFourthTier/Source/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp

@@ -134 +134 @@
     }
 
-    int signedLineNumber;
-    intptr_t sourceID;
-    String sourceURL;
-    JSValue function;
-    exec->interpreter()->retrieveLastCaller(exec, signedLineNumber, sourceID, sourceURL, function);
-    impl()->setLastSendLineNumber(signedLineNumber >= 0 ? signedLineNumber : 0);
-    impl()->setLastSendURL(sourceURL);
+    Vector<StackFrame> stackTrace(2);
+    exec->interpreter()->getStackTrace(stackTrace, 2);
+    impl()->setLastSendLineNumber(stackTrace[1].line);
+    impl()->setLastSendURL(stackTrace[1].sourceURL);
 
     setDOMException(exec, ec);

branches/dfgFourthTier/Source/WebCore/bindings/js/ScriptCallStackFactory.cpp

@@ -59 +59 @@
     if (JSC::ExecState* exec = JSMainThreadExecState::currentState()) {
         Vector<StackFrame> stackTrace;
-        Interpreter::getStackTrace(&exec->vm(), stackTrace);
+        exec->interpreter()->getStackTrace(stackTrace);
         for (Vector<StackFrame>::const_iterator iter = stackTrace.begin(); iter < stackTrace.end(); iter++) {
             frames.append(ScriptCallFrame(iter->friendlyFunctionName(exec), iter->friendlySourceURL(), iter->friendlyLineNumber()));
@@ -78 +78 @@
 {
     Vector<ScriptCallFrame> frames;
-    CallFrame* callFrame = exec;
-    while (true) {
-        ASSERT(callFrame);
-        int signedLineNumber;
-        intptr_t sourceID;
-        String urlString;
-        JSValue function;
-
-        exec->interpreter()->retrieveLastCaller(callFrame, signedLineNumber, sourceID, urlString, function);
-        String functionName;
-        if (function)
-            functionName = jsCast<JSFunction*>(function)->name(exec);
-        else {
-            // Caller is unknown, but if frames is empty we should still add the frame, because
-            // something called us, and gave us arguments.
-            if (!frames.isEmpty())
-                break;
-        }
-        unsigned lineNumber = signedLineNumber >= 0 ? signedLineNumber : 0;
-        frames.append(ScriptCallFrame(functionName, urlString, lineNumber));
-        if (!function || frames.size() == maxStackSize)
-            break;
-        callFrame = callFrame->callerFrame();
-    }
+    Vector<StackFrame> stackTrace;
+    maxStackSize++;
+    exec->interpreter()->getStackTrace(stackTrace, maxStackSize);
+    maxStackSize = stackTrace.size();
+    for (size_t i = 1; i < maxStackSize; i++)
+        frames.append(ScriptCallFrame(stackTrace[i].friendlyFunctionName(exec),
+            stackTrace[i].friendlySourceURL(), stackTrace[i].friendlyLineNumber()));
     return ScriptCallStack::create(frames);
 }