From 48035a2a35e02201ed22a8c9c832555fc09ba50f Mon Sep 17 00:00:00 2001
From: Daniel Bevenius <daniel.bevenius@gmail.com>
Date: Fri, 22 May 2020 14:25:36 +0200
Subject: [PATCH] src: use MaybeLocal::FromMaybe to return exception

This commit suggests using MaybeLocal::FromMaybe to return the exception
string, passing in a default value (an empty Local<Value>) which will be
used if the exception object is empty.

PR-URL: https://github.com/nodejs/node/pull/33514
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 src/api/environment.cc | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/api/environment.cc b/src/api/environment.cc
index 09d71b34581268..9645b84c9eba41 100644
--- a/src/api/environment.cc
+++ b/src/api/environment.cc
@@ -48,17 +48,11 @@ static MaybeLocal<Value> PrepareStackTraceCallback(Local<Context> context,
                                       Local<Array> trace) {
   Environment* env = Environment::GetCurrent(context);
   if (env == nullptr) {
-    MaybeLocal<String> s = exception->ToString(context);
-    return s.IsEmpty() ?
-      MaybeLocal<Value>() :
-      MaybeLocal<Value>(s.ToLocalChecked());
+    return exception->ToString(context).FromMaybe(Local<Value>());
   }
   Local<Function> prepare = env->prepare_stack_trace_callback();
   if (prepare.IsEmpty()) {
-    MaybeLocal<String> s = exception->ToString(context);
-    return s.IsEmpty() ?
-      MaybeLocal<Value>() :
-      MaybeLocal<Value>(s.ToLocalChecked());
+    return exception->ToString(context).FromMaybe(Local<Value>());
   }
   Local<Value> args[] = {
       context->Global(),