Skip to content

Commit

Permalink
deps: patch v8 for vs2019 in std17
Browse files Browse the repository at this point in the history
PR-URL: #40060
Reviewed-By: Richard Lau <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Michaël Zasso <[email protected]>
  • Loading branch information
gengjiawen authored and BethGriggs committed Sep 21, 2021
1 parent 5983568 commit b3843bf
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,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.13',
'v8_embedder_string': '-node.14',

##### V8 defaults for Node.js #####

Expand Down Expand Up @@ -268,6 +268,7 @@
],
'msvs_settings': {
'VCCLCompilerTool': {
'AdditionalOptions': ['/Zc:__cplusplus'],
'BufferSecurityCheck': 'true',
'DebugInformationFormat': 1, # /Z7 embed info in .obj files
'ExceptionHandling': 0, # /EHsc
Expand Down
2 changes: 1 addition & 1 deletion deps/v8/src/objects/fixed-array-inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ bool FixedArray::is_the_hole(Isolate* isolate, int index) {
return get(isolate, index).IsTheHole(isolate);
}

#if !defined(_WIN32) || (defined(_WIN64) && _MSC_VER < 1930)
#if !defined(_WIN32) || (defined(_WIN64) && _MSC_VER < 1930 && __cplusplus < 201703L)
void FixedArray::set(int index, Smi value) {
DCHECK_NE(map(), GetReadOnlyRoots().fixed_cow_array_map());
DCHECK_LT(static_cast<unsigned>(index), static_cast<unsigned>(length()));
Expand Down
2 changes: 1 addition & 1 deletion deps/v8/src/objects/fixed-array.h
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ class FixedArray
inline bool is_the_hole(Isolate* isolate, int index);

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

0 comments on commit b3843bf

Please sign in to comment.