1 files changed, 8 insertions, 39 deletions
diff --git a/libdeno/snapshot_creator.cc b/libdeno/snapshot_creator.cc
index 8038c9b13..e2511461b 100644
--- a/libdeno/snapshot_creator.cc
+++ b/libdeno/snapshot_creator.cc
@@ -7,42 +7,7 @@
 #include "third_party/v8/include/v8.h"
 #include "third_party/v8/src/base/logging.h"
 
-namespace deno {
-
-v8::StartupData SerializeInternalFields(v8::Local<v8::Object> holder, int index,
-                                        void* data) {
-  DCHECK_EQ(data, nullptr);
-  InternalFieldData* embedder_field = static_cast<InternalFieldData*>(
-      holder->GetAlignedPointerFromInternalField(index));
-  if (embedder_field == nullptr) return {nullptr, 0};
-  int size = sizeof(*embedder_field);
-  char* payload = new char[size];
-  // We simply use memcpy to serialize the content.
-  memcpy(payload, embedder_field, size);
-  return {payload, size};
-}
-
-v8::StartupData MakeSnapshot(const char* js_filename,
-                             const std::string& js_source,
-                             const std::string* source_map) {
-  auto* creator = new v8::SnapshotCreator(external_references);
-  auto* isolate = creator->GetIsolate();
-  v8::Isolate::Scope isolate_scope(isolate);
-  {
-    v8::HandleScope handle_scope(isolate);
-    auto context = v8::Context::New(isolate);
-    InitializeContext(isolate, context, js_filename, js_source, source_map);
-    creator->SetDefaultContext(context, v8::SerializeInternalFieldsCallback(
-                                            SerializeInternalFields, nullptr));
-  }
-
-  auto snapshot_blob =
-      creator->CreateBlob(v8::SnapshotCreator::FunctionCodeHandling::kClear);
-
-  return snapshot_blob;
-}
-
-}  // namespace deno
+namespace deno {}  // namespace deno
 
 int main(int argc, char** argv) {
   const char* snapshot_out_bin = argv[1];
@@ -64,9 +29,13 @@ int main(int argc, char** argv) {
   }
 
   deno_init();
-  auto snapshot_blob = deno::MakeSnapshot(
-      js_fn, js_source, source_map_fn != nullptr ? &source_map : nullptr);
-  std::string snapshot_str(snapshot_blob.data, snapshot_blob.raw_size);
+  Deno* d = deno_new_snapshotter(
+      nullptr, js_fn, js_source.c_str(),
+      source_map_fn != nullptr ? source_map.c_str() : nullptr);
+
+  auto snapshot = deno_get_snapshot(d);
+  std::string snapshot_str(reinterpret_cast<char*>(snapshot.data_ptr),
+                           snapshot.data_len);
 
   std::ofstream file_(snapshot_out_bin, std::ios::binary);
   file_ << snapshot_str;