75d2caf451
* chore: update to Node.js v18 * child_process: improve argument validation https://github.com/nodejs/node/pull/41305 * bootstrap: support configure-time user-land snapshot https://github.com/nodejs/node/pull/42466 * chore: update GN patch * src: disambiguate terms used to refer to builtins and addons https://github.com/nodejs/node/pull/44135 * src: use a typed array internally for process._exiting https://github.com/nodejs/node/pull/43883 * chore: lib/internal/bootstrap -> lib/internal/process * src: disambiguate terms used to refer to builtins and addons https://github.com/nodejs/node/pull/44135 * chore: remove redudant browserGlobals patch * chore: update BoringSSL patch * src: allow embedder-provided PageAllocator in NodePlatform https://github.com/nodejs/node/pull/38362 * chore: fixup Node.js crypto tests - https://github.com/nodejs/node/pull/44171 - https://github.com/nodejs/node/pull/41600 * lib: add Promise methods to avoid-prototype-pollution lint rule https://github.com/nodejs/node/pull/43849 * deps: update V8 to 10.1 https://github.com/nodejs/node/pull/42657 * src: add kNoBrowserGlobals flag for Environment https://github.com/nodejs/node/pull/40532 * chore: consolidate asar initialization patches * deps: update V8 to 10.1 https://github.com/nodejs/node/pull/42657 * deps: update V8 to 9.8 https://github.com/nodejs/node/pull/41610 * src,crypto: remove AllocatedBuffers from crypto_spkac https://github.com/nodejs/node/pull/40752 * build: enable V8's shared read-only heap https://github.com/nodejs/node/pull/42809 * src: fix ssize_t error from nghttp2.h https://github.com/nodejs/node/pull/44393 * chore: fixup ESM patch * chore: fixup patch indices * src: merge NativeModuleEnv into NativeModuleLoader https://github.com/nodejs/node/pull/43824 * [API] Pass OOMDetails to OOMErrorCallback https://chromium-review.googlesource.com/c/v8/v8/+/3647827 * src: iwyu in cleanup_queue.cc * src: return Maybe from a couple of functions https://github.com/nodejs/node/pull/39603 * src: clean up embedder API https://github.com/nodejs/node/pull/35897 * src: refactor DH groups to delete crypto_groups.h https://github.com/nodejs/node/pull/43896 * deps,src: use SIMD for normal base64 encoding https://github.com/nodejs/node/pull/39775 * chore: remove deleted source file * chore: update patches * chore: remove deleted source file * lib: add fetch https://github.com/nodejs/node/pull/41749 * chore: remove nonexistent node specs * test: split report OOM tests https://github.com/nodejs/node/pull/44389 * src: trace fs async api https://github.com/nodejs/node/pull/44057 * http: trace http request / response https://github.com/nodejs/node/pull/44102 * test: split test-crypto-dh.js https://github.com/nodejs/node/pull/40451 * crypto: introduce X509Certificate API https://github.com/nodejs/node/pull/36804 * src: split property helpers from node::Environment https://github.com/nodejs/node/pull/44056 * https://github.com/nodejs/node/pull/38905 bootstrap: implement run-time user-land snapshots via --build-snapshot and --snapshot-blob * lib,src: implement WebAssembly Web API https://github.com/nodejs/node/pull/42701 * fixup! deps,src: use SIMD for normal base64 encoding * fixup! src: refactor DH groups to delete crypto_groups.h * chore: fixup base64 GN file * fix: check that node::InitializeContext() returns true * chore: delete _noBrowserGlobals usage * chore: disable fetch in renderer procceses * dns: default to verbatim=true in dns.lookup() https://github.com/nodejs/node/pull/39987 Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
62 lines
2.5 KiB
Diff
62 lines
2.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Shelley Vohr <shelley.vohr@gmail.com>
|
|
Date: Mon, 9 Aug 2021 18:42:15 +0200
|
|
Subject: repl: fix crash when SharedArrayBuffer disabled
|
|
|
|
It's possible for SharedArrayBuffers to be disabled with
|
|
--no-harmony-sharedarraybuffer so we first need to check that this
|
|
isn't the case before attempting to use them in the repl or a crash occurs.
|
|
|
|
Upstreamed at https://github.com/nodejs/node/pull/39718.
|
|
|
|
diff --git a/benchmark/worker/atomics-wait.js b/benchmark/worker/atomics-wait.js
|
|
index a771b1813731edf4f0dd60f3505799e389f1d876..b9461677e2d7d1df192e752496e62cca837717b5 100644
|
|
--- a/benchmark/worker/atomics-wait.js
|
|
+++ b/benchmark/worker/atomics-wait.js
|
|
@@ -7,6 +7,10 @@ const bench = common.createBenchmark(main, {
|
|
});
|
|
|
|
function main({ n }) {
|
|
+ if (typeof SharedArrayBuffer === 'undefined') {
|
|
+ throw new Error('SharedArrayBuffers must be enabled to run this benchmark');
|
|
+ }
|
|
+
|
|
const i32arr = new Int32Array(new SharedArrayBuffer(4));
|
|
bench.start();
|
|
for (let i = 0; i < n; i++)
|
|
diff --git a/lib/internal/main/worker_thread.js b/lib/internal/main/worker_thread.js
|
|
index cd9ca227b9cac4ff021ce1643000ea4b45163df6..0846afec28ab5fb507eb5f3eb211f635d61dca17 100644
|
|
--- a/lib/internal/main/worker_thread.js
|
|
+++ b/lib/internal/main/worker_thread.js
|
|
@@ -10,7 +10,7 @@ const {
|
|
ObjectDefineProperty,
|
|
PromisePrototypeThen,
|
|
RegExpPrototypeExec,
|
|
- globalThis: { Atomics },
|
|
+ globalThis: { Atomics, SharedArrayBuffer },
|
|
} = primordials;
|
|
|
|
const {
|
|
@@ -157,6 +157,8 @@ port.on('message', (message) => {
|
|
|
|
process.cwd = function() {
|
|
const currentCounter = Atomics.load(cwdCounter, 0);
|
|
+ // SharedArrayBuffers can be disabled with --no-harmony-sharedarraybuffer.
|
|
+ if (typeof SharedArrayBuffer === 'undefined') return originalCwd();
|
|
if (currentCounter === lastCounter)
|
|
return cachedCwd;
|
|
lastCounter = currentCounter;
|
|
diff --git a/lib/internal/worker.js b/lib/internal/worker.js
|
|
index 8e396195209b83dff572792a78ee75d12d1f6610..4bb09b6ab5c31206a622814cbcd793c434b885d4 100644
|
|
--- a/lib/internal/worker.js
|
|
+++ b/lib/internal/worker.js
|
|
@@ -91,7 +91,8 @@ let cwdCounter;
|
|
|
|
const environmentData = new SafeMap();
|
|
|
|
-if (isMainThread) {
|
|
+// SharedArrayBuffers can be disabled with --no-harmony-sharedarraybuffer.
|
|
+if (isMainThread && typeof SharedArrayBuffer !== 'undefined') {
|
|
cwdCounter = new Uint32Array(new SharedArrayBuffer(4));
|
|
const originalChdir = process.chdir;
|
|
process.chdir = function(path) {
|