chore: bump node to v20.12.2 (main) (#41710)
* chore: bump node in DEPS to v20.12.0 * chore: update build_add_gn_build_files.patch * chore: update patches * chore: bump node in DEPS to v20.12.1 * chore: update patches * build: encode non-ASCII Latin1 characters as one byte in JS2C https://github.com/nodejs/node/pull/51605 * crypto: use EVP_MD_fetch and cache EVP_MD for hashes https://github.com/nodejs/node/pull/51034 * chore: update filenames.json * chore: bump node in DEPS to v20.12.2 * chore: update patches * src: support configurable snapshot https://github.com/nodejs/node/pull/50453 * test: remove test-domain-error-types flaky designation https://github.com/nodejs/node/pull/51717 * src: avoid draining platform tasks at FreeEnvironment https://github.com/nodejs/node/pull/51290 * chore: fix accidentally deleted v8 dep * lib: define FormData and fetch etc. in the built-in snapshot https://github.com/nodejs/node/pull/51598 * chore: rebase on main * chore: remove stray log --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Cheng <zcbenz@gmail.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
This commit is contained in:
parent
b118c70f77
commit
7120c58297
43 changed files with 371 additions and 774 deletions
|
@ -28,19 +28,18 @@ In file included from ../../third_party/electron_node/src/env-inl.h:32:
|
|||
1 error generated.
|
||||
|
||||
diff --git a/src/util.h b/src/util.h
|
||||
index 28873dbe4024df70a43fdc01ebd70c09acd118b0..f270efded6930f9fda56c7e277e0e3b4de6c91f4 100644
|
||||
index e5f508b5090b2a0a95dc280e010ddcc731ad0dd2..d1d78c5b2f0409c7a399444875079eb5c487a3e7 100644
|
||||
--- a/src/util.h
|
||||
+++ b/src/util.h
|
||||
@@ -131,10 +131,10 @@ void DumpJavaScriptBacktrace(FILE* fp);
|
||||
do { \
|
||||
/* Make sure that this struct does not end up in inline code, but */ \
|
||||
/* rather in a read-only data section when modifying this code. */ \
|
||||
- static const node::AssertionInfo args = { \
|
||||
+ static const node::AssertionInfo error_and_abort_args = { \
|
||||
__FILE__ ":" STRINGIFY(__LINE__), #expr, PRETTY_FUNCTION_NAME \
|
||||
}; \
|
||||
- node::Assert(args); \
|
||||
+ node::Assert(error_and_abort_args); \
|
||||
} while (0)
|
||||
|
||||
#ifdef __GNUC__
|
||||
@@ -145,9 +145,9 @@ void DumpJavaScriptBacktrace(FILE* fp);
|
||||
do { \
|
||||
/* Make sure that this struct does not end up in inline code, but */ \
|
||||
/* rather in a read-only data section when modifying this code. */ \
|
||||
- static const node::AssertionInfo args = { \
|
||||
+ static const node::AssertionInfo error_and_abort_args = { \
|
||||
__FILE__ ":" STRINGIFY(__LINE__), #expr, PRETTY_FUNCTION_NAME}; \
|
||||
- node::Assert(args); \
|
||||
+ node::Assert(error_and_abort_args); \
|
||||
/* `node::Assert` doesn't return. Add an [[noreturn]] abort() here to */ \
|
||||
/* make the compiler happy about no return value in the caller */ \
|
||||
/* function when calling ERROR_AND_ABORT. */ \
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue