Skip to content

Commit b38fd9d

Browse files
joyeecheungtargos
authored andcommitted
deps: use std::map in MSVC STL for EphemeronRememberedSet
PR-URL: #58070 Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: Darshan Sen <[email protected]> Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: Rafael Gonzaga <[email protected]>
1 parent d9294a3 commit b38fd9d

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

common.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
# Reset this number to 0 on major V8 upgrades.
4040
# Increment by one for each non-official patch applied to deps/v8.
41-
'v8_embedder_string': '-node.5',
41+
'v8_embedder_string': '-node.6',
4242

4343
##### V8 defaults for Node.js #####
4444

deps/v8/src/heap/ephemeron-remembered-set.h

+9
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55
#ifndef V8_HEAP_EPHEMERON_REMEMBERED_SET_H_
66
#define V8_HEAP_EPHEMERON_REMEMBERED_SET_H_
77

8+
#if defined(_MSVC_STL_VERSION)
9+
#include <map>
10+
#else
811
#include <unordered_map>
12+
#endif
913
#include <unordered_set>
1014

1115
#include "src/base/platform/mutex.h"
@@ -26,8 +30,13 @@ class EphemeronRememberedSet final {
2630
kEphemeronTableListSegmentSize>;
2731

2832
using IndicesSet = std::unordered_set<int>;
33+
#if defined(_MSVC_STL_VERSION)
34+
using TableMap = std::map<Tagged<EphemeronHashTable>, IndicesSet,
35+
Object::Comparer>;
36+
#else
2937
using TableMap = std::unordered_map<Tagged<EphemeronHashTable>, IndicesSet,
3038
Object::Hasher>;
39+
#endif
3140

3241
void RecordEphemeronKeyWrite(Tagged<EphemeronHashTable> table,
3342
Address key_slot);

0 commit comments

Comments
 (0)