Skip to content
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

Jump to bottom

src: fix regression that a source marker is lost with --enable-source-maps #43086

Closed
wants to merge 1 commit into from
+11 −3
Closed

src: fix regression that a source marker is lost with --enable-source-maps #43086

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
3 changes: 2 additions & 1 deletion src/node_errors.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ static std::string GetErrorSource(Isolate* isolate,
// added in the JavaScript context:
Environment* env = Environment::GetCurrent(isolate);
const bool has_source_map_url =
!message->GetScriptOrigin().SourceMapUrl().IsEmpty();
!message->GetScriptOrigin().SourceMapUrl().IsEmpty() &&
!message->GetScriptOrigin().SourceMapUrl()->IsUndefined();
cola119 marked this conversation as resolved.
Show resolved Hide resolved
if (has_source_map_url && env != nullptr && env->source_maps_enabled()) {
return sourceline;
}
Expand Down
11 changes: 9 additions & 2 deletions test/parallel/test-error-reporting.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@ const assert = require('assert');
const exec = require('child_process').exec;
const fixtures = require('../common/fixtures');

function errExec(script, callback) {
const cmd = `"${process.argv[0]}" "${fixtures.path(script)}"`;
function errExec(script, option, callback) {
callback = typeof option === 'function' ? option : callback;
option = typeof option === 'string' ? option : '';
const cmd = `"${process.argv[0]}" ${option} "${fixtures.path(script)}"`;
return exec(cmd, (err, stdout, stderr) => {
// There was some error
assert.ok(err);
Expand Down Expand Up @@ -79,3 +81,8 @@ errExec('throws_error6.js', common.mustCall((err, stdout, stderr) => {
errExec('throws_error7.js', common.mustCall((err, stdout, stderr) => {
assert.match(stderr, /throw {\r?\n\^\r?\n{ toString: \[Function: toString] }\r?\n\r?\nNode\.js \S+\r?\n$/);
}));

// Regression tests for https://github.com/nodejs/node/issues/39149
errExec('throws_error7.js', '--enable-source-maps', common.mustCall((err, stdout, stderr) => {
assert.match(stderr, /throw {\r?\n\^\r?\n{ toString: \[Function: toString] }\r?\n\r?\nNode\.js \S+\r?\n$/);
}));