From 7fc9d7d62a864d1e6af0e77291a105726f73279c Mon Sep 17 00:00:00 2001
From: Ryan Dahl <ry@tinyclouds.org>
Date: Wed, 24 Apr 2019 21:43:06 -0400
Subject: core: Add test for snapshotting from Rust (#2197)

---
 core/libdeno/api.cc     |  1 +
 core/libdeno/internal.h | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'core/libdeno')

diff --git a/core/libdeno/api.cc b/core/libdeno/api.cc
index ad9c2a574..53dad58e6 100644
--- a/core/libdeno/api.cc
+++ b/core/libdeno/api.cc
@@ -101,6 +101,7 @@ deno_snapshot deno_snapshot_new(Deno* d_) {
 
   auto blob = d->snapshot_creator_->CreateBlob(
       v8::SnapshotCreator::FunctionCodeHandling::kKeep);
+  d->has_snapshotted_ = true;
   return {reinterpret_cast<uint8_t*>(const_cast<char*>(blob.data)),
           blob.raw_size};
 }
diff --git a/core/libdeno/internal.h b/core/libdeno/internal.h
index ce8c63c56..0f4df9908 100644
--- a/core/libdeno/internal.h
+++ b/core/libdeno/internal.h
@@ -38,7 +38,8 @@ class DenoIsolate {
         recv_cb_(config.recv_cb),
         next_zero_copy_id_(1),  // zero_copy_id must not be zero.
         user_data_(nullptr),
-        resolve_cb_(nullptr) {
+        resolve_cb_(nullptr),
+        has_snapshotted_(false) {
     array_buffer_allocator_ = v8::ArrayBuffer::Allocator::NewDefaultAllocator();
     if (config.load_snapshot.data_ptr) {
       snapshot_.data =
@@ -53,7 +54,14 @@ class DenoIsolate {
       delete locker_;
     }
     if (snapshot_creator_) {
-      delete snapshot_creator_;
+      // TODO(ry) V8 has a strange assert which prevents a SnapshotCreator from
+      // being deallocated if it hasn't created a snapshot yet.
+      // https://github.com/v8/v8/blob/73212783fbd534fac76cc4b66aac899c13f71fc8/src/api.cc#L603
+      // If that assert is removed, this if guard could be removed.
+      // WARNING: There may be false positive LSAN errors here.
+      if (has_snapshotted_) {
+        delete snapshot_creator_;
+      }
     } else {
       isolate_->Dispose();
     }
@@ -120,6 +128,7 @@ class DenoIsolate {
   v8::StartupData snapshot_;
   v8::Persistent<v8::ArrayBuffer> global_import_buf_;
   v8::Persistent<v8::SharedArrayBuffer> shared_ab_;
+  bool has_snapshotted_;
 };
 
 class UserDataScope {
-- 
cgit v1.2.3