[wasm] Managed<T> ensures T's lifetime does not leak past Isolate's

src/isolate.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/isolate.h"
 
 #include <stdlib.h>
 
 #include <fstream>  // NOLINT(readability/streams)
 #include <sstream>
@@ skipping 2007 matching lines @@
 }
 
 
 Isolate::ThreadDataTable::~ThreadDataTable() {
   // TODO(svenpanne) The assertion below would fire if an embedder does not
   // cleanly dispose all Isolates before disposing v8, so we are conservative
   // and leave it out for now.
   // DCHECK_NULL(list_);
 }
 
+void Isolate::ReleaseManagedLifelines() {
+  for (Isolate::ManagedLifeline* current = managed_lifelines_root_.next_;
+       current != nullptr;) {
+    Isolate::ManagedLifeline* next = current->next_;
+    current->Dispose();
+    delete current;

[Eric Holk, 2017/02/11 02:19:29]

Out of curiosity, would it make sense to just rely on current's destructor
rather than having a separate Deleter?

[Mircea Trofin, 2017/02/11 02:29:32]

You mean, instead of a separate Dispose?

[Mircea Trofin, 2017/02/11 02:29:32]

You mean, instead of a separate Dispose?

[Eric Holk, 2017/02/13 21:55:35]

Sure, although I was referring to the Deleter in isolate.h, which seems to
include a Dispose method.

+    current = next;
+  }
+}
+
+Isolate::ManagedLifeline* Isolate::RegisterForReleaseAtTeardown(
+    void* value, Isolate::ManagedLifeline::Deleter deleter) {
+  DCHECK_NOT_NULL(value);
+  DCHECK_NOT_NULL(deleter);
+
+  Isolate::ManagedLifeline* ret = new Isolate::ManagedLifeline();
+  ret->value_ = value;
+  ret->deleter_ = deleter;
+  // Insert at head. We keep the head alive for the lifetime of the Isolate
+  // because otherwise we can't reset the head, should we delete it before
+  // the isolate expires
+  Isolate::ManagedLifeline* next = managed_lifelines_root_.next_;
+  managed_lifelines_root_.next_ = ret;
+  ret->prev_ = &managed_lifelines_root_;
+  ret->next_ = next;
+  if (next != nullptr) next->prev_ = ret;
+  return ret;
+}
+
+void Isolate::UnregisterFromReleaseAtTeardown(
+    Isolate::ManagedLifeline*& lifeline) {
+  DCHECK_NOT_NULL(lifeline->prev_);
+
+  lifeline->prev_->next_ = lifeline->next_;
+  if (lifeline->next_ != nullptr) lifeline->next_->prev_ = lifeline->prev_;
+  delete lifeline;
+  lifeline = nullptr;
+}
 
 Isolate::PerIsolateThreadData::~PerIsolateThreadData() {
 #if defined(USE_SIMULATOR)
   delete simulator_;
 #endif
 }
 
 
 Isolate::PerIsolateThreadData*
     Isolate::ThreadDataTable::Lookup(Isolate* isolate,
@@ skipping 349 matching lines @@
 
   delete cpu_profiler_;
   cpu_profiler_ = NULL;
 
   code_event_dispatcher_.reset();
 
   delete root_index_map_;
   root_index_map_ = NULL;
 
   ClearSerializerData();
+  ReleaseManagedLifelines();
 }
 
 
 void Isolate::SetIsolateThreadLocals(Isolate* isolate,
                                      PerIsolateThreadData* data) {
   base::Thread::SetThreadLocal(isolate_key_, isolate);
   base::Thread::SetThreadLocal(per_isolate_thread_data_key_, data);
 }
 
 
@@ skipping 1250 matching lines @@
   // Then check whether this scope intercepts.
   if ((flag & intercept_mask_)) {
     intercepted_flags_ |= flag;
     return true;
   }
   return false;
 }
 
 }  // namespace internal
 }  // namespace v8