Skip to content

Commit b3843bf

Browse files
gengjiawenBethGriggs
authored andcommittedSep 21, 2021
deps: patch v8 for vs2019 in std17
PR-URL: #40060 Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
1 parent 5983568 commit b3843bf

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed
 

‎common.gypi

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
# Reset this number to 0 on major V8 upgrades.
3838
# Increment by one for each non-official patch applied to deps/v8.
39-
'v8_embedder_string': '-node.13',
39+
'v8_embedder_string': '-node.14',
4040

4141
##### V8 defaults for Node.js #####
4242

@@ -268,6 +268,7 @@
268268
],
269269
'msvs_settings': {
270270
'VCCLCompilerTool': {
271+
'AdditionalOptions': ['/Zc:__cplusplus'],
271272
'BufferSecurityCheck': 'true',
272273
'DebugInformationFormat': 1, # /Z7 embed info in .obj files
273274
'ExceptionHandling': 0, # /EHsc

‎deps/v8/src/objects/fixed-array-inl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ bool FixedArray::is_the_hole(Isolate* isolate, int index) {
8484
return get(isolate, index).IsTheHole(isolate);
8585
}
8686

87-
#if !defined(_WIN32) || (defined(_WIN64) && _MSC_VER < 1930)
87+
#if !defined(_WIN32) || (defined(_WIN64) && _MSC_VER < 1930 && __cplusplus < 201703L)
8888
void FixedArray::set(int index, Smi value) {
8989
DCHECK_NE(map(), GetReadOnlyRoots().fixed_cow_array_map());
9090
DCHECK_LT(static_cast<unsigned>(index), static_cast<unsigned>(length()));

‎deps/v8/src/objects/fixed-array.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ class FixedArray
134134
inline bool is_the_hole(Isolate* isolate, int index);
135135

136136
// Setter that doesn't need write barrier.
137-
#if !defined(_WIN32) || (defined(_WIN64) && _MSC_VER < 1930)
137+
#if !defined(_WIN32) || (defined(_WIN64) && _MSC_VER < 1930 && __cplusplus < 201703L)
138138
inline void set(int index, Smi value);
139139
#else
140140
inline void set(int index, Smi value) {

0 commit comments

Comments
 (0)
Please sign in to comment.