deps: use std::map in MSVC STL for EphemeronRememberedSet · nodejs/node@2243e58 · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 633
• Pull requests 749
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 2243e58

Browse filesBrowse the repository at this point in the historyBrowse files

joyeecheung

authored and

targos

committed

deps: use std::map in MSVC STL for EphemeronRememberedSet

PR-URL: #58070 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Darshan Sen <raisinten@gmail.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com> Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com> Reviewed-By: Paolo Insogna <paolo@cowtech.it> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Filip Skokan <panva.ip@gmail.com> Reviewed-By: Richard Lau <richard.lau@ibm.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Chengzhong Wu <legendecas@gmail.com>

1 parent 4157964 commit 2243e58
Copy full SHA for 2243e58

2 files changed

+10-1Lines changed: 10 additions & 1 deletion

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• common.gypi
• deps/v8/src/heap
  • ephemeron-remembered-set.h

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎common.gypi‎

Copy file name to clipboardExpand all lines: common.gypi

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -38,7 +38,7 @@
38	38
39	39	# Reset this number to 0 on major V8 upgrades.
40	40	# Increment by one for each non-official patch applied to deps/v8.
41		- 'v8_embedder_string': '-node.3',
	41	+ 'v8_embedder_string': '-node.4',
42	42
43	43	##### V8 defaults for Node.js #####
44	44

Collapse file

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

Copy file name to clipboardExpand all lines: deps/v8/src/heap/ephemeron-remembered-set.h

+9Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -5,7 +5,11 @@
5	5	#ifndef V8_HEAP_EPHEMERON_REMEMBERED_SET_H_
6	6	#define V8_HEAP_EPHEMERON_REMEMBERED_SET_H_
7	7
	8	+ #if defined(_MSVC_STL_VERSION)
	9	+ #include <map>
	10	+ #else
8	11	#include <unordered_map>
	12	+ #endif
9	13	#include <unordered_set>
10	14
11	15	#include "src/base/platform/mutex.h"
@@ -32,8 +36,13 @@ class EphemeronRememberedSet final {
32	36	kEphemeronTableListSegmentSize>;
33	37
34	38	using IndicesSet = std::unordered_set<int>;
	39	+ #if defined(_MSVC_STL_VERSION)
	40	+ using TableMap = std::map<Tagged<EphemeronHashTable>, IndicesSet,
	41	+ Object::Comparer>;
	42	+ #else
35	43	using TableMap = std::unordered_map<Tagged<EphemeronHashTable>, IndicesSet,
36	44	Object::Hasher>;
	45	+ #endif
37	46
38	47	void RecordEphemeronKeyWrite(Tagged<EphemeronHashTable> table,
39	48	Address key_slot);

0 commit comments

Comments

0 (0)