mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-18 06:41:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix runtime stack trace computation (#11581)

Browse Source 
Co-authored-by: paperdave <paperdave@users.noreply.github.com>
This commit is contained in:
dave caruso
2024-06-05 00:26:03 -07:00
committed by GitHub
parent 2580d199a4
commit bb8c0d97ba
21 changed files with 380 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/bun.js/bindings/ErrorStackTrace.cpp
View File

@@ -5,6 +5,8 @@
#include "config.h"
#include "ErrorStackTrace.h"
#include "JavaScriptCore/Error.h"
#include "wtf/text/OrdinalNumber.h"
#include <JavaScriptCore/CatchScope.h>
#include <JavaScriptCore/DebuggerPrimitives.h>
@@ -15,6 +17,8 @@
#include <JavaScriptCore/NativeCallee.h>
#include <wtf/IterationStatus.h>
#include "ErrorStackFrame.h"
using namespace JSC;
using namespace WebCore;
@@ -358,65 +362,13 @@ bool JSCStackFrame::calculateSourcePositions()
if (!m_codeBlock) {
return false;
}
JSC::BytecodeIndex bytecodeIndex = hasBytecodeIndex() ? m_bytecodeIndex : JSC::BytecodeIndex();
/* Get the "raw" position info.
* Note that we're using m_codeBlock->unlinkedCodeBlock()->expressionRangeForBytecodeOffset rather than m_codeBlock->expressionRangeForBytecodeOffset
* in order get the "raw" offsets and avoid the CodeBlock's expressionRangeForBytecodeOffset modifications to the line and column numbers,
* (we don't need the column number from it, and we'll calculate the line "fixes" ourselves). */
ExpressionInfo::Entry info = m_codeBlock->unlinkedCodeBlock()->expressionInfoForBytecodeIndex(bytecodeIndex);
info.divot += m_codeBlock->sourceOffset();
/* On the first line of the source code, it seems that we need to "fix" the column with the starting
* offset. We currently use codeBlock->source()->startPosition().m_column.oneBasedInt() as the
* offset in the first line rather than codeBlock->firstLineColumnOffset(), which seems simpler
* (and what CodeBlock::expressionRangeForBytecodeOffset does). This is because firstLineColumnOffset
* values seems different from what we expect (according to v8's tests) and I haven't dove into the
* relevant parts in JSC (yet) to figure out why. */
unsigned columnOffset = info.lineColumn.line ? 0 : m_codeBlock->source().startColumn().zeroBasedInt();
// "Fix" the line number
JSC::ScriptExecutable* executable = m_codeBlock->ownerExecutable();
info.lineColumn.line = executable->overrideLineNumber(m_vm).value_or(info.lineColumn.line + executable->firstLine());
// Calculate the staring\ending offsets of the entire expression
int expressionStart = info.divot - info.startOffset;
int expressionStop = info.divot + info.endOffset;
// Make sure the range is valid
StringView sourceString = m_codeBlock->source().provider()->source();
if (!expressionStop || expressionStart > static_cast<int>(sourceString.length())) {
if (!hasBytecodeIndex()) {
return false;
}
// Search for the beginning of the line
unsigned int lineStart = expressionStart;
while ((lineStart > 0) && ('\n' != sourceString[lineStart - 1])) {
lineStart--;
}
// Search for the end of the line
unsigned int lineStop = expressionStop;
unsigned int sourceLength = sourceString.length();
while ((lineStop < sourceLength) && ('\n' != sourceString[lineStop])) {
lineStop++;
}
/* Finally, store the source "positions" info.
* Notes:
* - The retrieved column seem to point the "end column". To make sure we're current, we'll calculate the
* columns ourselves, since we've already found where the line starts. Note that in v8 it should be 0-based
* here (in contrast the 1-based column number in v8::StackFrame).
* - The static_casts are ugly, but comes from differences between JSC and v8's api, and should be OK
* since no source should be longer than "max int" chars.
*/
m_sourcePositions.expressionStart = WTF::OrdinalNumber::fromZeroBasedInt(expressionStart);
m_sourcePositions.expressionStop = WTF::OrdinalNumber::fromZeroBasedInt(expressionStop);
m_sourcePositions.line = WTF::OrdinalNumber::fromZeroBasedInt(static_cast<int>(info.lineColumn.line));
m_sourcePositions.startColumn = WTF::OrdinalNumber::fromZeroBasedInt((expressionStart - lineStart) + columnOffset);
m_sourcePositions.endColumn = WTF::OrdinalNumber::fromZeroBasedInt(m_sourcePositions.startColumn.zeroBasedInt() + (expressionStop - expressionStart));
m_sourcePositions.lineStart = WTF::OrdinalNumber::fromZeroBasedInt(static_cast<int>(lineStart));
m_sourcePositions.lineStop = WTF::OrdinalNumber::fromZeroBasedInt(static_cast<int>(lineStop));
auto location = Bun::getAdjustedPositionForBytecode(m_codeBlock, m_bytecodeIndex);
m_sourcePositions.line = location.line();
m_sourcePositions.column = location.column();
return true;
}