Skip to content

deps: V8: cherry-pick 25902244ad1a #50156

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

Merged
nodejs-github-bot merged 1 commit into from
Oct 15, 2023
Merged

deps: V8: cherry-pick 25902244ad1a #50156

Show file tree
Hide file tree
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
deps: V8: cherry-pick 25902244ad1a 
Original commit message:

    [api] add line breaks to the output of Message::PrintCurrentStackTrace

    Previously this prints the stack trace without line breaks and it
    can be difficult to read. This also affects
    --abort-on-uncaught-exception. This patch adds line breaks to the
    output to improve readability.

    Change-Id: I4c44b529f8c829329f784b0859b1d13c9ec56838
    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4925009
    Reviewed-by: Leszek Swirski <leszeks@chromium.org>
    Commit-Queue: Joyee Cheung <joyee@igalia.com>
    Cr-Commit-Position: refs/heads/main@{#90360}

Refs: v8/v8@2590224
  • Loading branch information
@joyeecheung
joyeecheung committed Oct 11, 2023
commit c4dffb3b2c6eeea11f8fdd1b77b52f30836ef324
2 changes: 1 addition & 1 deletion common.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

# Reset this number to 0 on major V8 upgrades.
# Increment by one for each non-official patch applied to deps/v8.
'v8_embedder_string': '-node.12',
'v8_embedder_string': '-node.13',

##### V8 defaults for Node.js #####

Expand Down
1 change: 1 addition & 0 deletions deps/v8/src/execution/isolate.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2503,6 +2503,7 @@ void Isolate::PrintCurrentStackTrace(std::ostream& out) {
for (int i = 0; i < frames->length(); ++i) {
Handle<CallSiteInfo> frame(CallSiteInfo::cast(frames->get(i)), this);
SerializeCallSiteInfo(this, frame, &builder);
if (i != frames->length() - 1) builder.AppendCharacter('\n');
}

Handle<String> stack_trace = builder.Finish().ToHandleChecked();
Expand Down
46 changes: 46 additions & 0 deletions deps/v8/test/cctest/test-api.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include <csignal>
#include <map>
#include <memory>
#include <sstream>
#include <string>

#include "test/cctest/cctest.h"
Expand Down Expand Up @@ -4926,6 +4927,51 @@ TEST(MessageGetSourceLine) {
});
}

void GetCurrentStackTrace(const v8::FunctionCallbackInfo<v8::Value>& args) {
std::stringstream ss;
v8::Message::PrintCurrentStackTrace(args.GetIsolate(), ss);
std::string str = ss.str();
args.GetReturnValue().Set(v8_str(str.c_str()));
}

THREADED_TEST(MessagePrintCurrentStackTrace) {
v8::Isolate* isolate = CcTest::isolate();
v8::HandleScope scope(isolate);
Local<ObjectTemplate> templ = ObjectTemplate::New(isolate);
templ->Set(isolate, "getCurrentStackTrace",
v8::FunctionTemplate::New(isolate, GetCurrentStackTrace));
LocalContext context(nullptr, templ);

v8::ScriptOrigin origin = v8::ScriptOrigin(isolate, v8_str("test"), 0, 0);
v8::Local<v8::String> script = v8_str(
"function c() {\n"
" return getCurrentStackTrace();\n"
"}\n"
"function b() {\n"
" return c();\n"
"}\n"
"function a() {\n"
" return b();\n"
"}\n"
"a();");
v8::Local<v8::Value> stack_trace =
v8::Script::Compile(context.local(), script, &origin)
.ToLocalChecked()
->Run(context.local())
.ToLocalChecked();

CHECK(stack_trace->IsString());
v8::String::Utf8Value stack_trace_value(isolate,
stack_trace.As<v8::String>());
std::string stack_trace_string(*stack_trace_value);
std::string expected(
"c (test:2:10)\n"
"b (test:5:10)\n"
"a (test:8:10)\n"
"test:10:1");
CHECK_EQ(stack_trace_string, expected);
}

THREADED_TEST(GetSetProperty) {
LocalContext context;
v8::Isolate* isolate = context->GetIsolate();
Expand Down