src, tools: replace raw ptr with smart ptr

NodeMainInstance::Create will now returrn an instance of NodeMainInstance in a unique_ptr. PR-URL: #28577 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
nodejs · Jul 20, 2019 · d34c256 · d34c256
1 parent c50e235
commit d34c256
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/src/node_main_instance.cc b/src/node_main_instance.cc
@@ -30,13 +30,14 @@ NodeMainInstance::NodeMainInstance(Isolate* isolate,
   SetIsolateUpForNode(isolate_, IsolateSettingCategories::kMisc);
 }
 
-NodeMainInstance* NodeMainInstance::Create(
+std::unique_ptr<NodeMainInstance> NodeMainInstance::Create(
     Isolate* isolate,
     uv_loop_t* event_loop,
     MultiIsolatePlatform* platform,
     const std::vector<std::string>& args,
     const std::vector<std::string>& exec_args) {
-  return new NodeMainInstance(isolate, event_loop, platform, args, exec_args);
+  return std::unique_ptr<NodeMainInstance>(
+      new NodeMainInstance(isolate, event_loop, platform, args, exec_args));
 }
 
 NodeMainInstance::NodeMainInstance(
@@ -81,7 +82,6 @@ NodeMainInstance::NodeMainInstance(
 void NodeMainInstance::Dispose() {
   CHECK(!owns_isolate_);
   platform_->DrainTasks(isolate_);
-  delete this;
 }
 
 NodeMainInstance::~NodeMainInstance() {

diff --git a/src/node_main_instance.h b/src/node_main_instance.h
@@ -4,6 +4,8 @@
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
 #include <cstddef>
+#include <memory>
+
 #include "node.h"
 #include "util.h"
 #include "uv.h"
@@ -22,7 +24,7 @@ class NodeMainInstance {
   //   platform->RegisterIsolate(isolate, loop);
   //   isolate->Initialize(...);
   //   isolate->Enter();
-  //   NodeMainInstance* main_instance =
+  //   std::unique_ptr<NodeMainInstance> main_instance =
   //       NodeMainInstance::Create(isolate, loop, args, exec_args);
   //
   // When tearing it down:
@@ -33,11 +35,13 @@ class NodeMainInstance {
   //   platform->UnregisterIsolate(isolate);
   //
   // After calling Dispose() the main_instance is no longer accessible.
-  static NodeMainInstance* Create(v8::Isolate* isolate,
-                                  uv_loop_t* event_loop,
-                                  MultiIsolatePlatform* platform,
-                                  const std::vector<std::string>& args,
-                                  const std::vector<std::string>& exec_args);
+  static std::unique_ptr<NodeMainInstance> Create(
+      v8::Isolate* isolate,
+      uv_loop_t* event_loop,
+      MultiIsolatePlatform* platform,
+      const std::vector<std::string>& args,
+      const std::vector<std::string>& exec_args);
+
   void Dispose();
 
   // Create a main instance that owns the isolate

diff --git a/tools/snapshot/snapshot_builder.cc b/tools/snapshot/snapshot_builder.cc
@@ -70,7 +70,7 @@ std::string SnapshotBuilder::Generate(
   Isolate* isolate = Isolate::Allocate();
   per_process::v8_platform.Platform()->RegisterIsolate(isolate,
                                                        uv_default_loop());
-  NodeMainInstance* main_instance = nullptr;
+  std::unique_ptr<NodeMainInstance> main_instance;
   std::string result;
 
   {