diff --git a/common.gypi b/common.gypi index c3cfd0ff838..f2e6f5fc063 100644 --- a/common.gypi +++ b/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.5', + 'v8_embedder_string': '-node.6', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/src/heap/ephemeron-remembered-set.h b/deps/v8/src/heap/ephemeron-remembered-set.h index 277337a225c..247d1a72b75 100644 --- a/deps/v8/src/heap/ephemeron-remembered-set.h +++ b/deps/v8/src/heap/ephemeron-remembered-set.h @@ -5,7 +5,11 @@ #ifndef V8_HEAP_EPHEMERON_REMEMBERED_SET_H_ #define V8_HEAP_EPHEMERON_REMEMBERED_SET_H_ +#if defined(_MSVC_STL_VERSION) +#include +#else #include +#endif #include #include "src/base/platform/mutex.h" @@ -26,8 +30,13 @@ class EphemeronRememberedSet final { kEphemeronTableListSegmentSize>; using IndicesSet = std::unordered_set; +#if defined(_MSVC_STL_VERSION) + using TableMap = std::map, IndicesSet, + Object::Comparer>; +#else using TableMap = std::unordered_map, IndicesSet, Object::Hasher>; +#endif void RecordEphemeronKeyWrite(Tagged table, Address key_slot);