nodejs
diff --git a/Collapse file
‎deps/v8/src/api/api.cc‎
Copy file name to clipboardExpand all lines: deps/v8/src/api/api.cc
+6-3Lines changed: 6 additions & 3 deletions b/Collapse file
‎deps/v8/src/api/api.cc‎
Copy file name to clipboardExpand all lines: deps/v8/src/api/api.cc
+6-3Lines changed: 6 additions & 3 deletions
diff --git a/Collapse file
‎deps/v8/test/cctest/test-serialize.cc‎
Copy file name to clipboardExpand all lines: deps/v8/test/cctest/test-serialize.cc
+25Lines changed: 25 additions & 0 deletions b/Collapse file
‎deps/v8/test/cctest/test-serialize.cc‎
Copy file name to clipboardExpand all lines: deps/v8/test/cctest/test-serialize.cc
+25Lines changed: 25 additions & 0 deletions
@@ -483,7 +483,6 @@ SnapshotCreator::SnapshotCreator(const intptr_t* external_references,
 
 SnapshotCreator::~SnapshotCreator() {
   SnapshotCreatorData* data = SnapshotCreatorData::cast(data_);
-  DCHECK(data->created_);
   Isolate* isolate = data->isolate_;
   isolate->Exit();
   isolate->Dispose();
@@ -590,8 +589,12 @@ StartupData SnapshotCreator::CreateBlob(
     SnapshotCreator::FunctionCodeHandling function_code_handling) {
   SnapshotCreatorData* data = SnapshotCreatorData::cast(data_);
   i::Isolate* isolate = reinterpret_cast<i::Isolate*>(data->isolate_);
-  DCHECK(!data->created_);
-  DCHECK(!data->default_context_.IsEmpty());
+  Utils::ApiCheck(!data->created_, "v8::SnapshotCreator::CreateBlob",
+                  "CreateBlob() cannot be called more than once on the same "
+                  "SnapshotCreator.");
+  Utils::ApiCheck(
+      !data->default_context_.IsEmpty(), "v8::SnapshotCreator::CreateBlob",
+      "CreateBlob() cannot be called before the default context is set.");
 
   const int num_additional_contexts = static_cast<int>(data->contexts_.Size());
   const int num_contexts = num_additional_contexts + 1;  // The default context.
 
@@ -2840,6 +2840,31 @@ TEST(Regress503552) {
   delete cache_data;
 }
 
+UNINITIALIZED_TEST(SnapshotCreatorBlobNotCreated) {
+  DisableAlwaysOpt();
+  DisableEmbeddedBlobRefcounting();
+  {
+    v8::SnapshotCreator creator;
+    v8::Isolate* isolate = creator.GetIsolate();
+    {
+      v8::HandleScope handle_scope(isolate);
+      v8::Local<v8::Context> context = v8::Context::New(isolate);
+      v8::Context::Scope context_scope(context);
+      v8::TryCatch try_catch(isolate);
+      v8::Local<v8::String> code = v8_str("throw new Error('test');");
+      CHECK(v8::Script::Compile(context, code)
+                .ToLocalChecked()
+                ->Run(context)
+                .IsEmpty());
+      CHECK(try_catch.HasCaught());
+    }
+    // SnapshotCreator should be destroyed just fine even when no
+    // blob is created.
+  }
+
+  FreeCurrentEmbeddedBlob();
+}
+
 UNINITIALIZED_TEST(SnapshotCreatorMultipleContexts) {
   DisableAlwaysOpt();
   DisableEmbeddedBlobRefcounting();