From 7d3a3028ffba22d3cb06e2b6e3e3365abd525410 Mon Sep 17 00:00:00 2001
From: Anatoli Papirovski <apapirovski@mac.com>
Date: Sun, 21 Jan 2018 10:34:36 -0500
Subject: [PATCH] src: remove unnecessary block scope

PR-URL: https://github.com/nodejs/node/pull/18291
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 src/node.cc | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/node.cc b/src/node.cc
index 656d132ec9f..dd6a44bbae3 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -1066,17 +1066,13 @@ MaybeLocal<Value> InternalMakeCallback(Environment* env,
     return Undefined(env->isolate());
   }
 
-  MaybeLocal<Value> ret;
+  MaybeLocal<Value> ret = callback->Call(env->context(), recv, argc, argv);
 
-  {
-    ret = callback->Call(env->context(), recv, argc, argv);
-
-    if (ret.IsEmpty()) {
-      // NOTE: For backwards compatibility with public API we return Undefined()
-      // if the top level call threw.
-      scope.MarkAsFailed();
-      return scope.IsInnerMakeCallback() ? ret : Undefined(env->isolate());
-    }
+  if (ret.IsEmpty()) {
+    // NOTE: For backwards compatibility with public API we return Undefined()
+    // if the top level call threw.
+    scope.MarkAsFailed();
+    return scope.IsInnerMakeCallback() ? ret : Undefined(env->isolate());
   }
 
   scope.Close();