ab08803959
* chore: bump node in DEPS to v18.17.0
* chore: update build_modify_js2c_py_to_allow_injection_of_original-fs_and_custom_embedder_js.patch
Xref: https://github.com/nodejs/node/pull/46930
manually sync patch to minor upstream code shear
* chore: update build_ensure_native_module_compilation_fails_if_not_using_a_new.patch
Xref: https://github.com/nodejs/node/pull/48248
manually sync patch to minor upstream code shear
* chore: update fix_expose_the_built-in_electron_module_via_the_esm_loader.patch
Xref: https://github.com/nodejs/node/pull/47824
chore: upstream func throwIfUnsupportedURLProtocol() has been removed, so no need to patch it
* chore: update api_pass_oomdetails_to_oomerrorcallback.patch
Xref: https://github.com/nodejs/node/pull/47695
manually sync patch to minor upstream code shear
* chore: remove fix_prevent_changing_functiontemplateinfo_after_publish.patch
Xref: https://github.com/nodejs/node/pull/46979 (upstreamed patch)
Xref: 2718147 (related)
* chore: update fix_adapt_debugger_tests_for_upstream_v8_changes.patch
Xref: https://github.com/nodejs/node/pull/47274
manually sync patch to minor upstream code shear
some tests moved from sequential to parallel
* chore: remove fix_libc_buffer_overflow_in_string_view_ctor.patch
Xref: fix_libc_buffer_overflow_in_string_view_ctor.patch
patch is no longer needed due to upstream bump to ada 2.2.0
* chore: remove fix_preventing_potential_oob_in_ada_no_scheme_parsing.patch
Xref: https://github.com/nodejs/node/pull/47339
patch is no longer needed due to upstream bump to ada 2.2.0
* chore: rebuild filenames.json
several files removed/added/changed upstream
* chore: update build_add_gn_build_files.patch
upstream dep histogram 0.11.7 moved its include path from src/ to include/
Xref: https://github.com/nodejs/node/pull/47742
* chore: update fix_crypto_tests_to_run_with_bssl.patch
Xref: https://github.com/nodejs/node/pull/47160
BoringSSL doesn't support BIO_s_secmem() (a secure heap variant of
BIO_s_mem()), so use BIO_s_mem() instead.
Related discussion of secure heap support in BoringSSL:
https://boringssl-review.googlesource.com/c/boringssl/+/54309
* fix: ftbfs in node dep ada
* fix: ftbfs in node dep uvwasi
* chore: rebuild patches
* chore: update fix_handle_boringssl_and_openssl_incompatibilities.patch
Upstream used `BIO_s_secmem()`, a secure heap variant of `BIO_s_mem()`.
BoringSSL doesn't support it, so this PR opts for `BIO_s_mem()` instead.
Upstream Node.js change that prompted this:
https://github.com/nodejs/node/pull/47160
Related discussion of BoringSSL support of secure heap:
https://boringssl-review.googlesource.com/c/boringssl/+/54309
* fix: work around Node 18 isURL() regression
* chore: sort script/node-disabled-tests.json alphabetically
* test: add parallel/test-snapshot-argv1 to disabled list
test: add parallel/test-snapshot-namespaced-builtin to disabled list
We don't support that type of snapshotting at the moment.
* chore: disable flaky node test parallel/test-dgram-send-cb-quelches-error
fails upstream in v18.x on my box as well
* ci: ensure spawned node tests have ELECTRON_RUN_AS_NODE set
* fixup! fix: work around Node 18 isURL() regression
fix: infinite loop regression
* fixup! fix: work around Node 18 isURL() regression
* chore: patch fixtures/errors/force_colors.snapshot
The line numbers in the stacktrace from our v8 build don't match what
Node's tests are expecting, so update the stacktrace to match our build.
The specific numbers probably aren't t needed for the force_colors test,
which is trying to see whether or not the lines are greyed out. One option
is to upstream a test change to stop hardcoding the stacktrace.
* fixup! fix: work around Node 18 isURL() regression
fix; pull in upstream bugfix
* fixup! ci: ensure spawned node tests have ELECTRON_RUN_AS_NODE set
chore: do not inject ELECTRON_RUN_AS_NODE in test-assert-colors.js
* chore: disable flaky node test parallel/test-debugger-random-port-with-inspect-port
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
52 lines
2.5 KiB
Diff
52 lines
2.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Shelley Vohr <shelley.vohr@gmail.com>
|
|
Date: Wed, 19 Apr 2023 14:13:23 +0200
|
|
Subject: chore: remove --no-harmony-atomics related code
|
|
|
|
This was removed in https://chromium-review.googlesource.com/c/v8/v8/+/4416459.
|
|
|
|
This patch can be removed when Node.js upgrades to a version of V8 containing
|
|
the above CL.
|
|
|
|
diff --git a/lib/.eslintrc.yaml b/lib/.eslintrc.yaml
|
|
index 3b406703ce9f981411cd9de5379f8574384e170a..bc439ce0aa072a778a22ba860eed35263740a1cd 100644
|
|
--- a/lib/.eslintrc.yaml
|
|
+++ b/lib/.eslintrc.yaml
|
|
@@ -33,10 +33,6 @@ rules:
|
|
message: Use `const { AbortController } = require('internal/abort_controller');` instead of the global.
|
|
- name: AbortSignal
|
|
message: Use `const { AbortSignal } = require('internal/abort_controller');` instead of the global.
|
|
- # Atomics is not available in primordials because it can be
|
|
- # disabled with --no-harmony-atomics CLI flag.
|
|
- - name: Atomics
|
|
- message: Use `const { Atomics } = globalThis;` instead of the global.
|
|
- name: Blob
|
|
message: Use `const { Blob } = require('buffer');` instead of the global.
|
|
- name: BroadcastChannel
|
|
diff --git a/lib/internal/main/worker_thread.js b/lib/internal/main/worker_thread.js
|
|
index 7fbfb64984c290a1d71c99c92084975c31ce18fe..be4d82086199855a10108528b3dacc663b839454 100644
|
|
--- a/lib/internal/main/worker_thread.js
|
|
+++ b/lib/internal/main/worker_thread.js
|
|
@@ -108,7 +108,7 @@ port.on('message', (message) => {
|
|
|
|
require('internal/worker').assignEnvironmentData(environmentData);
|
|
|
|
- if (SharedArrayBuffer !== undefined && Atomics !== undefined) {
|
|
+ if (SharedArrayBuffer !== undefined) {
|
|
// The counter is only passed to the workers created by the main thread,
|
|
// not to workers created by other workers.
|
|
let cachedCwd = '';
|
|
diff --git a/lib/internal/worker.js b/lib/internal/worker.js
|
|
index 3d828d2f6f2b19554f7fc01ea880c0c144d8837d..78fcaec8d694580798783c83c3282ec1aaac4aa7 100644
|
|
--- a/lib/internal/worker.js
|
|
+++ b/lib/internal/worker.js
|
|
@@ -93,8 +93,7 @@ let cwdCounter;
|
|
const environmentData = new SafeMap();
|
|
|
|
// SharedArrayBuffers can be disabled with --no-harmony-sharedarraybuffer.
|
|
-// Atomics can be disabled with --no-harmony-atomics.
|
|
-if (isMainThread && SharedArrayBuffer !== undefined && Atomics !== undefined) {
|
|
+if (isMainThread && SharedArrayBuffer !== undefined) {
|
|
cwdCounter = new Uint32Array(new SharedArrayBuffer(4));
|
|
const originalChdir = process.chdir;
|
|
process.chdir = function(path) {
|