@@ -1606,9 +1606,11 @@ void AppendExceptionLine(Environment* env,
1606
1606
ScriptOrigin origin = message->GetScriptOrigin ();
1607
1607
node::Utf8Value filename (env->isolate (), message->GetScriptResourceName ());
1608
1608
const char * filename_string = *filename;
1609
- int linenum = message->GetLineNumber ();
1609
+ int linenum = message->GetLineNumber (env-> context ()). FromJust ( );
1610
1610
// Print line of source code.
1611
- node::Utf8Value sourceline (env->isolate (), message->GetSourceLine ());
1611
+ MaybeLocal<String> source_line_maybe = message->GetSourceLine (env->context ());
1612
+ node::Utf8Value sourceline (env->isolate (),
1613
+ source_line_maybe.ToLocalChecked ());
1612
1614
const char * sourceline_string = *sourceline;
1613
1615
1614
1616
// Because of how node modules work, all scripts are wrapped with a
@@ -1752,7 +1754,7 @@ static void ReportException(Environment* env,
1752
1754
name.IsEmpty () ||
1753
1755
name->IsUndefined ()) {
1754
1756
// Not an error object. Just print as-is.
1755
- String::Utf8Value message (er);
1757
+ String::Utf8Value message (env-> isolate (), er);
1756
1758
1757
1759
PrintErrorString (" %s\n " , *message ? *message :
1758
1760
" <toString() threw exception>" );
@@ -1800,13 +1802,13 @@ static Local<Value> ExecuteString(Environment* env,
1800
1802
exit (3 );
1801
1803
}
1802
1804
1803
- Local <Value> result = script.ToLocalChecked ()->Run ();
1805
+ MaybeLocal <Value> result = script.ToLocalChecked ()->Run (env-> context () );
1804
1806
if (result.IsEmpty ()) {
1805
1807
ReportException (env, try_catch);
1806
1808
exit (4 );
1807
1809
}
1808
1810
1809
- return scope.Escape (result);
1811
+ return scope.Escape (result. ToLocalChecked () );
1810
1812
}
1811
1813
1812
1814
0 commit comments