Changeset 108681 in webkit

Timestamp:

Feb 23, 2012 3:18:05 PM (12 years ago)

Author:

oliver@apple.com

Message:

Make Interpreter::getStackTrace be able to generate the line number for the top callframe if none is provided
​https://bugs.webkit.org/show_bug.cgi?id=79407

Reviewed by Gavin Barraclough.

Outside of exception handling, we don't know what our source line number is. This
change allows us to pass -1 is as the initial line number, and get the correct line
number in the resultant stack trace. We can't completely elide the initial line
number (yet) due to some idiosyncrasies of the exception handling machinery.

• interpreter/Interpreter.cpp:

(JSC::getLineNumberForCallFrame):
(JSC):
(JSC::Interpreter::getStackTrace):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• interpreter/Interpreter.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-02-23  Oliver Hunt  <oliver@apple.com>
+
+        Make Interpreter::getStackTrace be able to generate the line number for the top callframe if none is provided
+        https://bugs.webkit.org/show_bug.cgi?id=79407
+
+        Reviewed by Gavin Barraclough.
+
+        Outside of exception handling, we don't know what our source line number is.  This
+        change allows us to pass -1 is as the initial line number, and get the correct line
+        number in the resultant stack trace.  We can't completely elide the initial line
+        number (yet) due to some idiosyncrasies of the exception handling machinery.
+
+        * interpreter/Interpreter.cpp:
+        (JSC::getLineNumberForCallFrame):
+        (JSC):
+        (JSC::Interpreter::getStackTrace):
+
 2012-02-22  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

@@ -818 +818 @@
 }
 
+static int getLineNumberForCallFrame(CallFrame* callFrame)
+{
+    callFrame = callFrame->removeHostCallFrameFlag();
+    CodeBlock* codeBlock = callFrame->codeBlock();
+    if (!codeBlock)
+        return -1;
+#if ENABLE(INTERPRETER)
+    if (!globalData->canUseJIT())
+        return codeBlock->lineNumberForBytecodeOffset(callFrame->bytecodeOffsetForNonDFGCode() - 1);
+#endif
+#if ENABLE(JIT)
+#if ENABLE(DFG_JIT)
+    if (codeBlock->getJITType() == JITCode::DFGJIT)
+        return codeBlock->lineNumberForBytecodeOffset(codeBlock->codeOrigin(callFrame->codeOriginIndexForDFG()).bytecodeIndex);
+#endif
+    return codeBlock->lineNumberForBytecodeOffset(callFrame->bytecodeOffsetForNonDFGCode());
+#endif
+}
+
 static CallFrame* getCallerInfo(JSGlobalData* globalData, CallFrame* callFrame, int& lineNumber)
 {
@@ -930 +949 @@
         return;
 
+    if (line == -1)
+        line = getLineNumberForCallFrame(callFrame);
+    
     while (callFrame && callFrame != CallFrame::noCaller()) {
         UString sourceURL;