From ff1edad48c2aba5bce51495f6446d2a17a28e0ae Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Sun, 5 Nov 2023 17:29:15 -0800 Subject: [PATCH] src: create BaseObject with node::Realm https://github.com/nodejs/node/pull/44348 --- .../src_adapt_to_v8_exception_api_change.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/patches/node/src_adapt_to_v8_exception_api_change.patch b/patches/node/src_adapt_to_v8_exception_api_change.patch index a74f9a39e2d83..bae96ce9bd1f9 100644 --- a/patches/node/src_adapt_to_v8_exception_api_change.patch +++ b/patches/node/src_adapt_to_v8_exception_api_change.patch @@ -7,10 +7,10 @@ Subject: src: adapt to v8::Exception API change Cherry picked fix from https://github.com/nodejs/node-v8/commit/675f411677c28a10a2f03d4b3ef14c2284c33587 diff --git a/src/env-inl.h b/src/env-inl.h -index debd982c75805c51ea7d01229b9d635550060503..103dc6711e71e15da640edc5e017bc638ddc6ad1 100644 +index 222c78ef0cb9904742fd44f8182278ab1f50cd59..e248a144b905a6c7c166796cddfe8442f8dc7158 100644 --- a/src/env-inl.h +++ b/src/env-inl.h -@@ -730,10 +730,10 @@ inline void Environment::ThrowRangeError(const char* errmsg) { +@@ -780,10 +780,10 @@ inline void Environment::ThrowRangeError(const char* errmsg) { } inline void Environment::ThrowError( @@ -24,15 +24,15 @@ index debd982c75805c51ea7d01229b9d635550060503..103dc6711e71e15da640edc5e017bc63 inline void Environment::ThrowErrnoException(int errorno, diff --git a/src/env.h b/src/env.h -index 45a9a7811b4abe1effb6acf2c89a772a7c2256c9..36e8e7d960a95a9040ad963c79a7f66c89233c87 100644 +index 87df6e1f32e584aa0c6ae21856299fff31d67669..c9a455be8c395a2f231f56e0a54211466362aa1d 100644 --- a/src/env.h +++ b/src/env.h -@@ -956,7 +956,7 @@ class Environment : public MemoryRetainer { - inline void RemoveHeapSnapshotNearHeapLimitCallback(size_t heap_limit); +@@ -1017,7 +1017,7 @@ class Environment : public MemoryRetainer { + }; private: - inline void ThrowError(v8::Local (*fun)(v8::Local), + inline void ThrowError(v8::Local (*fun)(v8::Local, v8::Local), const char* errmsg); - - std::list loaded_addons_; + void TrackContext(v8::Local context); + void UntrackContext(v8::Local context);