Skip to content

appendSourceToErrorMessage: skip builtin code blocks #369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
robobun wants to merge 1 commit into
base: main
Choose a base branch
from
Open

appendSourceToErrorMessage: skip builtin code blocks #369

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Source/JavaScriptCore/runtime/ErrorInstance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,15 @@ String appendSourceToErrorMessage(CodeBlock* codeBlock, BytecodeIndex bytecodeIn
if (!codeBlock->hasExpressionInfo() || message.isNull())
return message;

// Builtin source text contains @-prefixed private identifiers that should not appear in
// user-visible error messages. BytecodeGenerator::emitExpressionInfo skips private builtins in
// !ASSERT_ENABLED builds so those bail at the hasExpressionInfo() check above, but builtins can
// still carry expression info (ASSERT_ENABLED builds, and non-private builtins under
// USE(BUN_JSC_ADDITIONS)). Matches the isBuiltinFunction() check in
// FindFirstCallerFrameWithCodeblockFunctor so the two callers behave the same.
if (codeBlock->unlinkedCodeBlock()->isBuiltinFunction())
return message;

auto info = codeBlock->expressionInfoForBytecodeIndex(bytecodeIndex);
int expressionStart = info.divot - info.startOffset;
int expressionStop = info.divot + info.endOffset;
Expand Down
Loading