@@ -1595,9 +1595,11 @@ void AppendExceptionLine(Environment* env,
1595
1595
ScriptOrigin origin = message->GetScriptOrigin ();
1596
1596
node::Utf8Value filename (env->isolate (), message->GetScriptResourceName ());
1597
1597
const char * filename_string = *filename;
1598
- int linenum = message->GetLineNumber ();
1598
+ int linenum = message->GetLineNumber (env-> context ()). FromJust ( );
1599
1599
// Print line of source code.
1600
- node::Utf8Value sourceline (env->isolate (), message->GetSourceLine ());
1600
+ MaybeLocal<String> source_line_maybe = message->GetSourceLine (env->context ());
1601
+ node::Utf8Value sourceline (env->isolate (),
1602
+ source_line_maybe.ToLocalChecked ());
1601
1603
const char * sourceline_string = *sourceline;
1602
1604
if (strstr (sourceline_string, " node-do-not-add-exception-line" ) != nullptr )
1603
1605
return ;
@@ -1745,7 +1747,7 @@ static void ReportException(Environment* env,
1745
1747
name.IsEmpty () ||
1746
1748
name->IsUndefined ()) {
1747
1749
// Not an error object. Just print as-is.
1748
- String::Utf8Value message (er);
1750
+ String::Utf8Value message (env-> isolate (), er);
1749
1751
1750
1752
PrintErrorString (" %s\n " , *message ? *message :
1751
1753
" <toString() threw exception>" );
@@ -1797,13 +1799,13 @@ static Local<Value> ExecuteString(Environment* env,
1797
1799
exit (3 );
1798
1800
}
1799
1801
1800
- Local <Value> result = script.ToLocalChecked ()->Run ();
1802
+ MaybeLocal <Value> result = script.ToLocalChecked ()->Run (env-> context () );
1801
1803
if (result.IsEmpty ()) {
1802
1804
ReportException (env, try_catch);
1803
1805
exit (4 );
1804
1806
}
1805
1807
1806
- return scope.Escape (result);
1808
+ return scope.Escape (result. ToLocalChecked () );
1807
1809
}
1808
1810
1809
1811
0 commit comments