From 7735b2a904255caa53a581c918df3df47e5c8e52 Mon Sep 17 00:00:00 2001
From: Anna Henningsen <anna@addaleax.net>
Date: Sat, 1 Feb 2020 11:42:30 +0100
Subject: [PATCH] src: remove unused `Worker::child_port_` member

This fixes a compiler warning introduced in 9225939528590f652e6.
---
 src/node_worker.cc | 18 +++++-------------
 src/node_worker.h  |  3 ---
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/node_worker.cc b/src/node_worker.cc
index b350219d813832..5ce2bfec685a47 100644
--- a/src/node_worker.cc
+++ b/src/node_worker.cc
@@ -251,14 +251,6 @@ void Worker::Run() {
       Isolate::DisallowJavascriptExecutionScope disallow_js(isolate_,
           Isolate::DisallowJavascriptExecutionScope::THROW_ON_FAILURE);
 
-      // Grab the parent-to-child channel and render is unusable.
-      MessagePort* child_port;
-      {
-        Mutex::ScopedLock lock(mutex_);
-        child_port = child_port_;
-        child_port_ = nullptr;
-      }
-
       {
         Context::Scope context_scope(env_->context());
         {
@@ -394,13 +386,13 @@ void Worker::CreateEnvMessagePort(Environment* env) {
   HandleScope handle_scope(isolate_);
   Mutex::ScopedLock lock(mutex_);
   // Set up the message channel for receiving messages in the child.
-  child_port_ = MessagePort::New(env,
-                                 env->context(),
-                                 std::move(child_port_data_));
+  MessagePort* child_port = MessagePort::New(env,
+                                             env->context(),
+                                             std::move(child_port_data_));
   // MessagePort::New() may return nullptr if execution is terminated
   // within it.
-  if (child_port_ != nullptr)
-    env->set_message_port(child_port_->object(isolate_));
+  if (child_port != nullptr)
+    env->set_message_port(child_port->object(isolate_));
 }
 
 void Worker::JoinThread() {
diff --git a/src/node_worker.h b/src/node_worker.h
index f84362f35c1897..d8e97f6057a26c 100644
--- a/src/node_worker.h
+++ b/src/node_worker.h
@@ -99,9 +99,6 @@ class Worker : public AsyncWrap {
   std::unique_ptr<MessagePortData> child_port_data_;
   std::shared_ptr<KVStore> env_vars_;
 
-  // The child port is kept alive by the child Environment's persistent
-  // handle to it, as long as that child Environment exists.
-  MessagePort* child_port_ = nullptr;
   // This is always kept alive because the JS object associated with the Worker
   // instance refers to it via its [kPort] property.
   MessagePort* parent_port_ = nullptr;