Skip to content

vm: never abort on caught syntax error #17394

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

Closed
addaleax wants to merge 2 commits into from
Closed

vm: never abort on caught syntax error #17394

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac1fea0
src: remove tracking for exception arrow data
addaleax Nov 29, 2017
2dbb612
vm: never abort on caught syntax error
addaleax Nov 29, 2017
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
Next Next commit
src: remove tracking for exception arrow data 
This is unnecessary since we only run `AppendExceptionLine()`
once per exception at this point anyway.
  • Loading branch information
@addaleax
addaleax committed Dec 1, 2017
commit ac1fea00f520618a6cbc22a2250bde5a30825615
1 change: 0 additions & 1 deletion src/env.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ class ModuleWrap;
V(contextify_global_private_symbol, "node:contextify:global") \
V(decorated_private_symbol, "node:decorated") \
V(npn_buffer_private_symbol, "node:npnBuffer") \
V(processed_private_symbol, "node:processed") \
V(selected_npn_buffer_private_symbol, "node:selectedNpnBuffer") \
V(domain_private_symbol, "node:domain") \

Expand Down
10 changes: 0 additions & 10 deletions src/node.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1301,16 +1301,6 @@ void AppendExceptionLine(Environment* env,
Local<Object> err_obj;
if (!er.IsEmpty() && er->IsObject()) {
err_obj = er.As<Object>();

auto context = env->context();
auto processed_private_symbol = env->processed_private_symbol();
// Do it only once per message
if (err_obj->HasPrivate(context, processed_private_symbol).FromJust())
return;
err_obj->SetPrivate(
context,
processed_private_symbol,
True(env->isolate()));
}

// Print (filename):(line number): (message).
Expand Down
4 changes: 1 addition & 3 deletions src/node_contextify.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,9 +668,7 @@ class ContextifyScript : public BaseObject {
compile_options);

if (v8_script.IsEmpty()) {
if (display_errors) {
DecorateErrorStack(env, try_catch);
}
DecorateErrorStack(env, try_catch);
try_catch.ReThrow();
return;
}
Expand Down