node-darwin-x64 25.8.2 → 26.0.0

package/include/node/common.gypi

@@ -38,7 +38,7 @@
 
     # Reset this number to 0 on major V8 upgrades.
     # Increment by one for each non-official patch applied to deps/v8.
-    'v8_embedder_string': '-node.24',
+    'v8_embedder_string': '-node.19',
 
     ##### V8 defaults for Node.js #####
 
@@ -591,6 +591,18 @@
           '-maix64',
         ],
         'conditions': [
+          [ 'clang==1', {
+            'cflags': [
+              '-fno-integrated-as',
+              '-fno-xl-pragma-pack',
+              '-mcpu=power9',
+            ],
+            'cflags_cc': [
+              '-fno-integrated-as',
+              '-fno-xl-pragma-pack',
+              '-mcpu=power9',
+            ],
+          }],
           [ '"<(aix_variant_name)"=="OS400"', {            # a.k.a. `IBM i`
             'ldflags': [
               '-Wl,-blibpath:/QOpenSys/pkgs/lib:/QOpenSys/usr/lib',

package/include/node/config.gypi

@@ -19,6 +19,7 @@
     "host_arch": "x64",
     "target_arch": "x64",
     "node_byteorder": "little",
+    "cargo_rust_target": "x86_64-apple-darwin",
     "want_separate_host_toolset": 0,
     "node_use_node_snapshot": "true",
     "node_use_node_code_cache": "true",
@@ -37,8 +38,8 @@
     "node_no_browser_globals": "false",
     "node_shared": "false",
     "libdir": "lib",
-    "node_module_version": 141,
-    "shlib_suffix": "141.dylib",
+    "node_module_version": 147,
+    "shlib_suffix": "147.dylib",
     "asan": 0,
     "ubsan": 0,
     "coverage": "false",
@@ -50,12 +51,6 @@
       "lib/_http_incoming.js",
       "lib/_http_outgoing.js",
       "lib/_http_server.js",
-      "lib/_stream_duplex.js",
-      "lib/_stream_passthrough.js",
-      "lib/_stream_readable.js",
-      "lib/_stream_transform.js",
-      "lib/_stream_wrap.js",
-      "lib/_stream_writable.js",
       "lib/_tls_common.js",
       "lib/_tls_wrap.js",
       "lib/assert.js",
@@ -89,6 +84,7 @@
       "lib/internal/async_hooks.js",
       "lib/internal/async_local_storage/async_context_frame.js",
       "lib/internal/async_local_storage/async_hooks.js",
+      "lib/internal/async_local_storage/run_scope.js",
       "lib/internal/blob.js",
       "lib/internal/blocklist.js",
       "lib/internal/bootstrap/node.js",
@@ -137,6 +133,7 @@
       "lib/internal/crypto/sig.js",
       "lib/internal/crypto/util.js",
       "lib/internal/crypto/webcrypto.js",
+      "lib/internal/crypto/webcrypto_util.js",
       "lib/internal/crypto/webidl.js",
       "lib/internal/crypto/x509.js",
       "lib/internal/data_url.js",
@@ -282,6 +279,17 @@
       "lib/internal/streams/end-of-stream.js",
       "lib/internal/streams/fast-utf8-stream.js",
       "lib/internal/streams/from.js",
+      "lib/internal/streams/iter/broadcast.js",
+      "lib/internal/streams/iter/consumers.js",
+      "lib/internal/streams/iter/duplex.js",
+      "lib/internal/streams/iter/from.js",
+      "lib/internal/streams/iter/pull.js",
+      "lib/internal/streams/iter/push.js",
+      "lib/internal/streams/iter/ringbuffer.js",
+      "lib/internal/streams/iter/share.js",
+      "lib/internal/streams/iter/transform.js",
+      "lib/internal/streams/iter/types.js",
+      "lib/internal/streams/iter/utils.js",
       "lib/internal/streams/lazy_transform.js",
       "lib/internal/streams/legacy.js",
       "lib/internal/streams/operators.js",
@@ -373,6 +381,7 @@
       "lib/sqlite.js",
       "lib/stream.js",
       "lib/stream/consumers.js",
+      "lib/stream/iter.js",
       "lib/stream/promises.js",
       "lib/stream/web.js",
       "lib/string_decoder.js",
@@ -391,7 +400,8 @@
       "lib/vm.js",
       "lib/wasi.js",
       "lib/worker_threads.js",
-      "lib/zlib.js"
+      "lib/zlib.js",
+      "lib/zlib/iter.js"
     ],
     "node_cctest_sources": [
       "src/node_snapshot_stub.cc",
@@ -469,7 +479,7 @@
     "v8_enable_external_code_space": 0,
     "v8_enable_31bit_smis_on_64bit_arch": 0,
     "v8_enable_extensible_ro_snapshot": 0,
-    "v8_enable_temporal_support": 0,
+    "v8_enable_temporal_support": 1,
     "v8_trace_maps": 0,
     "node_use_v8_platform": "true",
     "node_use_bundled_v8": "true",

package/include/node/cppgc/allocation.h

@@ -50,18 +50,17 @@ class MakeGarbageCollectedTraitInternal {
  protected:
   static inline void MarkObjectAsFullyConstructed(const void* payload) {
     // See api_constants for an explanation of the constants.
-    std::atomic<uint16_t>* atomic_mutable_bitfield =
-        reinterpret_cast<std::atomic<uint16_t>*>(
-            const_cast<uint16_t*>(reinterpret_cast<const uint16_t*>(
-                reinterpret_cast<const uint8_t*>(payload) -
-                api_constants::kFullyConstructedBitFieldOffsetFromPayload)));
+    std::atomic_ref<uint16_t> atomic_mutable_bitfield(
+        *const_cast<uint16_t*>(reinterpret_cast<const uint16_t*>(
+            reinterpret_cast<const uint8_t*>(payload) -
+            api_constants::kFullyConstructedBitFieldOffsetFromPayload)));
     // It's safe to split use load+store here (instead of a read-modify-write
     // operation), since it's guaranteed that this 16-bit bitfield is only
     // modified by a single thread. This is cheaper in terms of code bloat (on
     // ARM) and performance.
-    uint16_t value = atomic_mutable_bitfield->load(std::memory_order_relaxed);
+    uint16_t value = atomic_mutable_bitfield.load(std::memory_order_relaxed);
     value |= api_constants::kFullyConstructedBitMask;
-    atomic_mutable_bitfield->store(value, std::memory_order_release);
+    atomic_mutable_bitfield.store(value, std::memory_order_release);
   }
 
   // Dispatch based on compile-time information.

package/include/node/cppgc/heap-statistics.h

@@ -55,8 +55,12 @@ struct HeapStatistics final {
     size_t resident_size_bytes = 0;
     /** Amount of memory actually used on the page. */
     size_t used_size_bytes = 0;
-    /** Statistics for object allocated on the page. Filled only when
-     * NameProvider::SupportsCppClassNamesAsObjectNames() is true. */
+    /**
+     * Statistics for object allocated on the page. If an object provides a
+     * name by inheriting from NameProvider, its name will be recorded in the
+     * statistics. Other objects, without an explicit name, are merged under a
+     * single type unless the CPPGC_SUPPORTS_OBJECT_NAME build flag is enabled.
+     */
     std::vector<ObjectStatsEntry> object_statistics;
   };
 

package/include/node/cppgc/internal/api-constants.h

@@ -28,7 +28,7 @@ constexpr size_t kGB = kMB * 1024;
 static constexpr size_t kFullyConstructedBitFieldOffsetFromPayload =
     2 * sizeof(uint16_t);
 // Mask for in-construction bit.
-static constexpr uint16_t kFullyConstructedBitMask = uint16_t{1};
+static constexpr uint16_t kFullyConstructedBitMask = uint16_t{1} << 15;
 
 static constexpr size_t kPageSizeBits = 17;
 static constexpr size_t kPageSize = size_t{1} << kPageSizeBits;

package/include/node/cppgc/visitor.h

@@ -167,6 +167,7 @@ class V8_EXPORT Visitor {
    */
   template <typename T>
   void Trace(const T& object) {
+    static_assert(!IsGarbageCollectedOrMixinTypeV<T>);
 #if V8_ENABLE_CHECKS
     // This object is embedded in potentially multiple nested objects. The
     // outermost object must not be in construction as such objects are (a) not

package/include/node/libplatform/v8-tracing.h

@@ -14,9 +14,11 @@
 #include "v8-platform.h"  // NOLINT(build/include_directory)
 
 namespace perfetto {
+#if defined(V8_USE_PERFETTO_JSON_EXPORT)
 namespace trace_processor {
 class TraceProcessorStorage;
 }
+#endif  // defined(V8_USE_PERFETTO_JSON_EXPORT)
 class TracingSession;
 }
 
@@ -231,6 +233,12 @@ class V8_PLATFORM_EXPORT TraceConfig {
 #define V8_PLATFORM_NON_EXPORTED_BASE(code) code
 #endif  // defined(_MSC_VER)
 
+/**
+ * V8 Tracing controller default implementation.
+ *
+ * Will become obsolete in Perfetto build
+ * (v8_use_perfetto_json_export = true).
+ */
 class V8_PLATFORM_EXPORT TracingController
     : public V8_PLATFORM_NON_EXPORTED_BASE(v8::TracingController) {
  public:
@@ -307,10 +315,13 @@ class V8_PLATFORM_EXPORT TracingController
   std::unique_ptr<TraceConfig> trace_config_;
   std::atomic_bool recording_{false};
 
-#if defined(V8_USE_PERFETTO)
-  std::ostream* output_stream_ = nullptr;
+#if defined(V8_USE_PERFETTO_JSON_EXPORT)
   std::unique_ptr<perfetto::trace_processor::TraceProcessorStorage>
       trace_processor_;
+#endif
+
+#if defined(V8_USE_PERFETTO)
+  std::ostream* output_stream_ = nullptr;
   TraceEventListener* listener_for_testing_ = nullptr;
   std::unique_ptr<perfetto::TracingSession> tracing_session_;
 #else   // !defined(V8_USE_PERFETTO)

package/include/node/node.h

@@ -76,7 +76,7 @@
 #include "v8-platform.h"  // NOLINT(build/include_order)
 #include "node_version.h"  // NODE_MODULE_VERSION
 
-#include "node_api.h"
+#include "node_api_types.h"  //  napi_addon_register_func
 
 #include <functional>
 #include <memory>
@@ -124,6 +124,8 @@
 
 // Forward-declare libuv loop
 struct uv_loop_s;
+struct napi_module;
+struct ssl_ctx_st;  // Forward declaration of SSL_CTX for OpenSSL.
 
 // Forward-declare these functions now to stop MSVS from becoming
 // terminally confused when it's done in node_internals.h
@@ -1656,6 +1658,20 @@ NODE_DEPRECATED(
                                        v8::Local<v8::Object> object,
                                        v8::Object::Wrappable* wrappable));
 
+namespace crypto {
+
+// Returns the SSL_CTX* from a SecureContext JS object, as returned by
+// tls.createSecureContext().
+// Returns nullptr if the value is not a SecureContext instance,
+// or if Node.js was built without OpenSSL.
+//
+// The returned pointer is not owned by the caller and must not be freed.
+// It is valid only while the SecureContext JS object remains alive.
+NODE_EXTERN struct ssl_ctx_st* GetSSLCtx(v8::Local<v8::Context> context,
+                                         v8::Local<v8::Value> secure_context);
+
+}  // namespace crypto
+
 }  // namespace node
 
 #endif  // SRC_NODE_H_

package/include/node/node_object_wrap.h

@@ -49,7 +49,8 @@ class ObjectWrap {
     assert(handle->InternalFieldCount() > 0);
     // Cast to ObjectWrap before casting to T.  A direct cast from void
     // to T won't work right when T has more than one base class.
-    void* ptr = handle->GetAlignedPointerFromInternalField(0);
+    void* ptr = handle->GetAlignedPointerFromInternalField(
+        0, v8::kEmbedderDataTypeTagDefault);
     ObjectWrap* wrap = static_cast<ObjectWrap*>(ptr);
     return static_cast<T*>(wrap);
   }
@@ -75,7 +76,8 @@ class ObjectWrap {
   inline void Wrap(v8::Local<v8::Object> handle) {
     assert(persistent().IsEmpty());
     assert(handle->InternalFieldCount() > 0);
-    handle->SetAlignedPointerInInternalField(0, this);
+    handle->SetAlignedPointerInInternalField(
+        0, this, v8::kEmbedderDataTypeTagDefault);
     persistent().Reset(v8::Isolate::GetCurrent(), handle);
     MakeWeak();
   }

package/include/node/node_version.h

@@ -22,9 +22,9 @@
 #ifndef SRC_NODE_VERSION_H_
 #define SRC_NODE_VERSION_H_
 
-#define NODE_MAJOR_VERSION 25
-#define NODE_MINOR_VERSION 8
-#define NODE_PATCH_VERSION 2
+#define NODE_MAJOR_VERSION 26
+#define NODE_MINOR_VERSION 0
+#define NODE_PATCH_VERSION 0
 
 #define NODE_VERSION_IS_LTS 0
 #define NODE_VERSION_LTS_CODENAME ""
@@ -95,7 +95,7 @@
 #if defined(NODE_EMBEDDER_MODULE_VERSION)
 #define NODE_MODULE_VERSION NODE_EMBEDDER_MODULE_VERSION
 #else
-#define NODE_MODULE_VERSION 141
+#define NODE_MODULE_VERSION 147
 #endif
 
 // The NAPI_VERSION supported by the runtime. This is the inclusive range of

package/include/node/uv/unix.h

@@ -85,13 +85,10 @@
 struct uv__io_s;
 struct uv_loop_s;
 
-typedef void (*uv__io_cb)(struct uv_loop_s* loop,
-                          struct uv__io_s* w,
-                          unsigned int events);
 typedef struct uv__io_s uv__io_t;
 
 struct uv__io_s {
-  uv__io_cb cb;
+  uintptr_t bits;
   struct uv__queue pending_queue;
   struct uv__queue watcher_queue;
   unsigned int pevents; /* Pending event mask i.e. mask at next tick. */

package/include/node/uv/version.h

@@ -31,8 +31,8 @@
  */
 
 #define UV_VERSION_MAJOR 1
-#define UV_VERSION_MINOR 51
-#define UV_VERSION_PATCH 0
+#define UV_VERSION_MINOR 52
+#define UV_VERSION_PATCH 1
 #define UV_VERSION_IS_RELEASE 1
 #define UV_VERSION_SUFFIX ""
 

package/include/node/uv/win.h

@@ -279,7 +279,7 @@ typedef struct {
   DWORD tls_index;
 } uv_key_t;
 
-#define UV_ONCE_INIT { 0, NULL }
+#define UV_ONCE_INIT { 0, { NULL } }
 
 typedef struct uv_once_s {
   unsigned char unused;

package/include/node/uv.h

@@ -44,10 +44,8 @@ extern "C" {
     /* Building static library. */
 #   define UV_EXTERN /* nothing */
 # endif
-#elif __GNUC__ >= 4
+#elif defined(__GNUC__)
 # define UV_EXTERN __attribute__((visibility("default")))
-#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550) /* Sun Studio >= 8 */
-# define UV_EXTERN __global
 #else
 # define UV_EXTERN /* nothing */
 #endif
@@ -741,6 +739,9 @@ struct uv_udp_send_s {
 UV_EXTERN int uv_udp_init(uv_loop_t*, uv_udp_t* handle);
 UV_EXTERN int uv_udp_init_ex(uv_loop_t*, uv_udp_t* handle, unsigned int flags);
 UV_EXTERN int uv_udp_open(uv_udp_t* handle, uv_os_sock_t sock);
+UV_EXTERN int uv_udp_open_ex(uv_udp_t* handle,
+                             uv_os_sock_t sock,
+                             unsigned int flags);
 UV_EXTERN int uv_udp_bind(uv_udp_t* handle,
                           const struct sockaddr* addr,
                           unsigned int flags);
@@ -1203,7 +1204,7 @@ struct uv_cpu_times_s {
 };
 
 struct uv_cpu_info_s {
-  char* model;
+  const char* model;
   int speed;
   struct uv_cpu_times_s cpu_times;
 };
@@ -1254,7 +1255,8 @@ struct uv_statfs_s {
   uint64_t f_bavail;
   uint64_t f_files;
   uint64_t f_ffree;
-  uint64_t f_spare[4];
+  uint64_t f_frsize;
+  uint64_t f_spare[3];
 };
 
 typedef enum {
@@ -1964,7 +1966,6 @@ UV_EXTERN void uv_wtf8_to_utf16(const char* wtf8,
                                 size_t utf16_len);
 
 /* Don't export the private CPP symbols. */
-#undef UV_HANDLE_TYPE_PRIVATE
 #undef UV_REQ_TYPE_PRIVATE
 #undef UV_REQ_PRIVATE_FIELDS
 #undef UV_STREAM_PRIVATE_FIELDS
@@ -1976,12 +1977,10 @@ UV_EXTERN void uv_wtf8_to_utf16(const char* wtf8,
 #undef UV_TIMER_PRIVATE_FIELDS
 #undef UV_GETADDRINFO_PRIVATE_FIELDS
 #undef UV_GETNAMEINFO_PRIVATE_FIELDS
-#undef UV_FS_REQ_PRIVATE_FIELDS
 #undef UV_WORK_PRIVATE_FIELDS
 #undef UV_FS_EVENT_PRIVATE_FIELDS
 #undef UV_SIGNAL_PRIVATE_FIELDS
 #undef UV_LOOP_PRIVATE_FIELDS
-#undef UV_LOOP_PRIVATE_PLATFORM_FIELDS
 #undef UV__ERR
 
 #ifdef __cplusplus

package/include/node/v8-array-buffer.h

@@ -77,6 +77,11 @@ class V8_EXPORT BackingStore : public v8::internal::BackingStoreBase {
    */
   bool IsShared() const;
 
+  /**
+   * Indicates whether the backing store is immutable.
+   */
+  bool IsImmutable() const;
+
   /**
    * Indicates whether the backing store was created for a resizable ArrayBuffer
    * or a growable SharedArrayBuffer, and thus may be resized by user JavaScript
@@ -328,6 +333,11 @@ class V8_EXPORT ArrayBuffer : public Object {
    */
   bool WasDetached() const;
 
+  /**
+   * Returns true if this ArrayBuffer is immutable.
+   */
+  bool IsImmutable() const;
+
   /**
    * Detaches this ArrayBuffer and all its views (typed arrays).
    * Detaching sets the byte length of the buffer and all typed arrays to zero,

package/include/node/v8-callbacks.h

@@ -184,6 +184,7 @@ enum GCCallbackFlags {
   kGCCallbackFlagCollectAllAvailableGarbage = 1 << 4,
   kGCCallbackFlagCollectAllExternalMemory = 1 << 5,
   kGCCallbackScheduleIdleGarbageCollection = 1 << 6,
+  kGCCallbackFlagLastResort = 1 << 7,
 };
 
 using GCCallback = void (*)(GCType type, GCCallbackFlags flags);
@@ -232,6 +233,10 @@ struct OOMDetails {
 using OOMErrorCallback = void (*)(const char* location,
                                   const OOMDetails& details);
 
+using OOMErrorCallbackWithData = void (*)(const char* location,
+                                          const OOMDetails& details,
+                                          void* data);
+
 using MessageCallback = void (*)(Local<Message> message, Local<Value> data);
 
 // --- Tracing ---
@@ -255,6 +260,15 @@ enum class CrashKeyId {
 
 using AddCrashKeyCallback = void (*)(CrashKeyId id, const std::string& value);
 
+// --- CrashKeyString Callbacks ---
+using CrashKey = void*;
+enum class CrashKeySize { Size32, Size64, Size256, Size1024 };
+
+using AllocateCrashKeyStringCallback =
+    std::function<CrashKey(const char key[], CrashKeySize size)>;
+using SetCrashKeyStringCallback =
+    std::function<void(CrashKey key, const std::string_view value)>;
+
 // --- Enter/Leave Script Callback ---
 using BeforeCallEnteredCallback = void (*)(Isolate*);
 using CallCompletedCallback = void (*)(Isolate*);
@@ -321,9 +335,6 @@ using WasmAsyncResolvePromiseCallback = void (*)(
 using WasmLoadSourceMapCallback = Local<String> (*)(Isolate* isolate,
                                                     const char* name);
 
-// --- Callback for checking if WebAssembly imported strings are enabled ---
-using WasmImportedStringsEnabledCallback = bool (*)(Local<Context> context);
-
 // --- Callback for checking if WebAssembly Custom Descriptors are enabled ---
 using WasmCustomDescriptorsEnabledCallback = bool (*)(Local<Context> context);
 
@@ -331,14 +342,12 @@ using WasmCustomDescriptorsEnabledCallback = bool (*)(Local<Context> context);
 using SharedArrayBufferConstructorEnabledCallback =
     bool (*)(Local<Context> context);
 
-// --- Callback for checking if WebAssembly JSPI is enabled ---
-using WasmJSPIEnabledCallback = bool (*)(Local<Context> context);
-
 /**
  * Import phases in import requests.
  */
 enum class ModuleImportPhase {
   kSource,
+  kDefer,
   kEvaluation,
 };
 

package/include/node/v8-context.h

@@ -255,12 +255,6 @@ class V8_EXPORT Context : public Data {
    */
   Maybe<void> DeepFreeze(DeepFreezeDelegate* delegate = nullptr);
 
-  /** Returns the isolate associated with a current context. */
-  V8_DEPRECATED(
-      "Use Isolate::GetCurrent() instead, which is guaranteed to return the "
-      "same isolate since https://crrev.com/c/6458560.")
-  Isolate* GetIsolate();
-
   /** Returns the microtask queue associated with a current context. */
   MicrotaskQueue* GetMicrotaskQueue();
 
@@ -282,6 +276,20 @@ class V8_EXPORT Context : public Data {
    * Gets the embedder data with the given index, which must have been set by a
    * previous call to SetEmbedderData with the same index.
    */
+  V8_INLINE Local<Data> GetEmbedderDataV2(int index);
+
+  /**
+   * Sets the embedder data with the given index, growing the data as
+   * needed. Note that index 0 currently has a special meaning for Chrome's
+   * debugger.
+   */
+  void SetEmbedderDataV2(int index, Local<Data> value);
+
+  /**
+   * Gets the embedder data with the given index, which must have been set by a
+   * previous call to SetEmbedderData with the same index.
+   */
+  V8_DEPRECATE_SOON("Use GetEmbedderDataV2 instead")
   V8_INLINE Local<Value> GetEmbedderData(int index);
 
   /**
@@ -297,6 +305,7 @@ class V8_EXPORT Context : public Data {
    * needed. Note that index 0 currently has a special meaning for Chrome's
    * debugger.
    */
+  V8_DEPRECATE_SOON("Use SetEmbedderDataV2 instead")
   void SetEmbedderData(int index, Local<Value> value);
 
   /**
@@ -305,22 +314,42 @@ class V8_EXPORT Context : public Data {
    * SetAlignedPointerInEmbedderData with the same index. Note that index 0
    * currently has a special meaning for Chrome's debugger.
    */
+  V8_INLINE void* GetAlignedPointerFromEmbedderData(Isolate* isolate, int index,
+                                                    EmbedderDataTypeTag tag);
+  V8_INLINE void* GetAlignedPointerFromEmbedderData(int index,
+                                                    EmbedderDataTypeTag tag);
+
+  V8_DEPRECATED(
+      "Use GetAlignedPointerFromEmbedderData with EmbedderDataTypeTag "
+      "parameter instead.")
   V8_INLINE void* GetAlignedPointerFromEmbedderData(Isolate* isolate,
-                                                    int index);
-  V8_INLINE void* GetAlignedPointerFromEmbedderData(int index);
+                                                    int index) {
+    return GetAlignedPointerFromEmbedderData(isolate, index,
+                                             kEmbedderDataTypeTagDefault);
+  }
+
+  V8_DEPRECATED(
+      "Use GetAlignedPointerFromEmbedderData with EmbedderDataTypeTag "
+      "parameter instead.")
+  V8_INLINE void* GetAlignedPointerFromEmbedderData(int index) {
+    return GetAlignedPointerFromEmbedderData(index,
+                                             kEmbedderDataTypeTagDefault);
+  }
+
+  void SetAlignedPointerInEmbedderData(int index, void* value,
+                                       EmbedderDataTypeTag tag);
 
   /**
    * Sets a 2-byte-aligned native pointer in the embedder data with the given
    * index, growing the data as needed. Note that index 0 currently has a
    * special meaning for Chrome's debugger.
    */
-  V8_DEPRECATE_SOON(
+  V8_DEPRECATED(
       "Use SetAlignedPointerInEmbedderData with EmbedderDataTypeTag parameter "
       "instead.")
-  void SetAlignedPointerInEmbedderData(int index, void* value);
-
-  void SetAlignedPointerInEmbedderData(int index, void* value,
-                                       EmbedderDataTypeTag slot);
+  void SetAlignedPointerInEmbedderData(int index, void* value) {
+    SetAlignedPointerInEmbedderData(index, value, kEmbedderDataTypeTagDefault);
+  }
 
   /**
    * Control whether code generation from strings is allowed. Calling
@@ -439,7 +468,9 @@ class V8_EXPORT Context : public Data {
   internal::ValueHelper::InternalRepresentationType GetDataFromSnapshotOnce(
       size_t index);
   Local<Value> SlowGetEmbedderData(int index);
-  void* SlowGetAlignedPointerFromEmbedderData(int index);
+  Local<Data> SlowGetEmbedderDataV2(int index);
+  void* SlowGetAlignedPointerFromEmbedderData(int index,
+                                              EmbedderDataTypeTag tag);
 };
 
 // --- Implementation ---
@@ -456,7 +487,7 @@ Local<Value> Context::GetEmbedderData(int index) {
   A value = I::ReadRawField<A>(embedder_data, value_offset);
 #ifdef V8_COMPRESS_POINTERS
   // We read the full pointer value and then decompress it in order to avoid
-  // dealing with potential endiannes issues.
+  // dealing with potential endianness issues.
   value = I::DecompressTaggedField(embedder_data, static_cast<uint32_t>(value));
 #endif
 
@@ -467,7 +498,31 @@ Local<Value> Context::GetEmbedderData(int index) {
 #endif
 }
 
-void* Context::GetAlignedPointerFromEmbedderData(Isolate* isolate, int index) {
+V8_INLINE Local<Data> Context::GetEmbedderDataV2(int index) {
+#ifndef V8_ENABLE_CHECKS
+  using A = internal::Address;
+  using I = internal::Internals;
+  A ctx = internal::ValueHelper::ValueAsAddress(this);
+  A embedder_data =
+      I::ReadTaggedPointerField(ctx, I::kNativeContextEmbedderDataOffset);
+  int value_offset =
+      I::kEmbedderDataArrayHeaderSize + (I::kEmbedderDataSlotSize * index);
+  A value = I::ReadRawField<A>(embedder_data, value_offset);
+#ifdef V8_COMPRESS_POINTERS
+  // We read the full pointer value and then decompress it in order to avoid
+  // dealing with potential endianness issues.
+  value = I::DecompressTaggedField(embedder_data, static_cast<uint32_t>(value));
+#endif
+
+  auto* isolate = I::GetCurrentIsolate();
+  return Local<Data>::New(isolate, value);
+#else
+  return SlowGetEmbedderDataV2(index);
+#endif
+}
+
+void* Context::GetAlignedPointerFromEmbedderData(Isolate* isolate, int index,
+                                                 EmbedderDataTypeTag tag) {
 #if !defined(V8_ENABLE_CHECKS)
   using A = internal::Address;
   using I = internal::Internals;
@@ -477,16 +532,15 @@ void* Context::GetAlignedPointerFromEmbedderData(Isolate* isolate, int index) {
   int value_offset = I::kEmbedderDataArrayHeaderSize +
                      (I::kEmbedderDataSlotSize * index) +
                      I::kEmbedderDataSlotExternalPointerOffset;
-  return reinterpret_cast<void*>(
-      I::ReadExternalPointerField<{internal::kFirstEmbedderDataTag,
-                                   internal::kLastEmbedderDataTag}>(
-          isolate, embedder_data, value_offset));
+  return reinterpret_cast<void*>(I::ReadExternalPointerField(
+      isolate, embedder_data, value_offset, ToExternalPointerTag(tag)));
 #else
-  return SlowGetAlignedPointerFromEmbedderData(index);
+  return SlowGetAlignedPointerFromEmbedderData(index, tag);
 #endif
 }
 
-void* Context::GetAlignedPointerFromEmbedderData(int index) {
+void* Context::GetAlignedPointerFromEmbedderData(int index,
+                                                 EmbedderDataTypeTag tag) {
 #if !defined(V8_ENABLE_CHECKS)
   using A = internal::Address;
   using I = internal::Internals;
@@ -497,12 +551,10 @@ void* Context::GetAlignedPointerFromEmbedderData(int index) {
                      (I::kEmbedderDataSlotSize * index) +
                      I::kEmbedderDataSlotExternalPointerOffset;
   Isolate* isolate = I::GetCurrentIsolateForSandbox();
-  return reinterpret_cast<void*>(
-      I::ReadExternalPointerField<{internal::kFirstEmbedderDataTag,
-                                   internal::kLastEmbedderDataTag}>(
-          isolate, embedder_data, value_offset));
+  return reinterpret_cast<void*>(I::ReadExternalPointerField(
+      isolate, embedder_data, value_offset, ToExternalPointerTag(tag)));
 #else
-  return SlowGetAlignedPointerFromEmbedderData(index);
+  return SlowGetAlignedPointerFromEmbedderData(index, tag);
 #endif
 }