nodejs
diff --git a/‎src/env.h‎
Lines changed: 3 additions & 0 deletions b/‎src/env.h‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/node_snapshotable.cc‎
Lines changed: 8 additions & 0 deletions b/‎src/node_snapshotable.cc‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎test/parallel/test-snapshot-coverage.js‎
Lines changed: 61 additions & 0 deletions b/‎test/parallel/test-snapshot-coverage.js‎
Lines changed: 61 additions & 0 deletions
@@ -881,6 +881,9 @@ class Environment : public MemoryRetainer {
   inline inspector::Agent* inspector_agent() const {
     return inspector_agent_.get();
   }
+  inline void StopInspector() {
+    inspector_agent_.reset();
+  }
 
   inline bool is_in_inspector_console_call() const;
   inline void set_is_in_inspector_console_call(bool value);
 
@@ -1131,6 +1131,14 @@ ExitCode SnapshotBuilder::CreateSnapshot(SnapshotData* out,
         fprintf(stderr, "Environment = %p\n", env);
       }
 
+      // Clean up the states left by the inspector because V8 cannot serialize
+      // them. They don't need to be persisted and can be created from scratch
+      // after snapshot deserialization.
+      RunAtExit(env);
+#if HAVE_INSPECTOR
+      env->StopInspector();
+#endif
+
       // Serialize the native states
       out->isolate_data_info = setup->isolate_data()->Serialize(creator);
       out->env_info = env->Serialize(creator);
 
@@ -0,0 +1,61 @@
+'use strict';
+
+// This tests that the snapshot works with built-in coverage collection.
+
+const common = require('../common');
+common.skipIfInspectorDisabled();
+
+const { spawnSyncAndExitWithoutError } = require('../common/child_process');
+const tmpdir = require('../common/tmpdir');
+const fixtures = require('../common/fixtures');
+const fs = require('fs');
+const assert = require('assert');
+
+tmpdir.refresh();
+const blobPath = tmpdir.resolve('snapshot.blob');
+const file = fixtures.path('empty.js');
+
+function filterCoverageFiles(name) {
+  return name.startsWith('coverage') && name.endsWith('.json');
+}
+{
+  // Create the snapshot.
+  const { child } = spawnSyncAndExitWithoutError(process.execPath, [
+    '--snapshot-blob',
+    blobPath,
+    '--build-snapshot',
+    file,
+  ], {
+    cwd: tmpdir.path,
+    env: {
+      ...process.env,
+      NODE_V8_COVERAGE: tmpdir.path,
+      NODE_DEBUG_NATIVE: 'inspector_profiler',
+    }
+  });
+  const files = fs.readdirSync(tmpdir.path);
+  console.log('Files in tmpdir.path', files);  // Log for debugging the test.
+  const coverage = files.filter(filterCoverageFiles);
+  console.log(child.stderr.toString());
+  assert.strictEqual(coverage.length, 1);
+}
+
+{
+  const { child } = spawnSyncAndExitWithoutError(process.execPath, [
+    '--snapshot-blob',
+    blobPath,
+    file,
+  ], {
+    cwd: tmpdir.path,
+    env: {
+      ...process.env,
+      NODE_V8_COVERAGE: tmpdir.path,
+      NODE_DEBUG_NATIVE: 'inspector_profiler',
+    },
+  });
+  const files = fs.readdirSync(tmpdir.path);
+  console.log('Files in tmpdir.path', files);  // Log for debugging the test.
+  const coverage = files.filter(filterCoverageFiles);
+  console.log(child.stderr.toString());
+  assert.strictEqual(coverage.length, 2);
+}
Original file line number	Diff line number	Diff line change
@@ -881,6 +881,9 @@ class Environment : public MemoryRetainer {
881	881	inline inspector::Agent* inspector_agent() const {
882	882	return inspector_agent_.get();
883	883	}
	884	+ inline void StopInspector() {
	885	+ inspector_agent_.reset();
	886	+ }
884	887
885	888	inline bool is_in_inspector_console_call() const;
886	889	inline void set_is_in_inspector_console_call(bool value);