lib: reset the cwd cache before execution

lib/internal/bootstrap/switches/does_own_process_state.js

@@ -2,6 +2,12 @@
 
 const credentials = internalBinding('credentials');
 const rawMethods = internalBinding('process_methods');
+const {
+  namespace: {
+    addSerializeCallback,
+    isBuildingSnapshot,
+  },
+} = require('internal/v8/startup_snapshot');
 
 process.abort = rawMethods.abort;
 process.umask = wrappedUmask;
@@ -107,6 +113,12 @@ function wrapPosixCredentialSetters(credentials) {
 // directory is changed by `chdir`, it'll be updated.
 let cachedCwd = '';
 
+if (isBuildingSnapshot()) {
+  addSerializeCallback(() => {
+    cachedCwd = '';
+  });
+}
+
 function wrappedChdir(directory) {
   validateString(directory, 'directory');
   rawMethods.chdir(directory);

test/fixtures/snapshot/cwd.js

@@ -0,0 +1,10 @@
+const {
+  setDeserializeMainFunction,
+} = require('v8').startupSnapshot;
+
+// To make sure the cwd is present in the cache
+process.cwd();
+
+setDeserializeMainFunction(() => {
+  console.log(process.cwd());
+});

test/parallel/test-snapshot-cwd.js

@@ -0,0 +1,49 @@
+'use strict';
+
+// This tests that user land snapshots works when the instance restored from
+// the snapshot is launched with -p and -e
+
+require('../common');
+const { spawnSyncAndExitWithoutError } = require('../common/child_process');
+const tmpdir = require('../common/tmpdir');
+const fixtures = require('../common/fixtures');
+const fs = require('fs');
+const path = require('path');
+
+tmpdir.refresh();
+const blobPath = tmpdir.resolve('snapshot.blob');
+const file = fixtures.path('snapshot', 'cwd.js');
+
+const subdir = path.join(tmpdir.path, 'foo');
+fs.mkdirSync(subdir);
+
+{
+  // Create the snapshot.
+  spawnSyncAndExitWithoutError(process.execPath, [
+    '--snapshot-blob',
+    blobPath,
+    '--build-snapshot',
+    file,
+  ], {
+    cwd: tmpdir.path,
+    encoding: 'utf8'
+  }, {
+    status: 0,
+  });
+}
+
+{
+  // Check a custom works.
+  spawnSyncAndExitWithoutError(process.execPath, [
+    '--snapshot-blob',
+    blobPath,
+    file,
+  ], {
+    cwd: subdir,
+    encoding: 'utf8'
+  }, {
+    status: 0,
+    trim: true,
+    stdout: subdir
+  });
+}