Skip to content

Commit 6775958

Browse files
gengjiawenBethGriggs
authored andcommittedSep 21, 2021
deps: patch for v8 on windows
PR-URL: #40010 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent f03bae7 commit 6775958

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed
 

‎.github/workflows/build-windows.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ env:
1818
jobs:
1919
build-windows:
2020
if: github.event.pull_request.draft == false
21-
runs-on: windows-latest
21+
strategy:
22+
matrix:
23+
windows: [windows-2019, windows-2022]
24+
fail-fast: false
25+
runs-on: ${{ matrix.windows }}
2226
steps:
2327
- uses: actions/checkout@v2
2428
- name: Set up Python ${{ env.PYTHON_VERSION }}

‎common.gypi

+1-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.12',
39+
'v8_embedder_string': '-node.13',
4040

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

‎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)
87+
#if !defined(_WIN32) || (defined(_WIN64) && _MSC_VER < 1930)
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

+3-3
Original file line numberDiff line numberDiff line change
@@ -134,16 +134,16 @@ 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)
137+
#if !defined(_WIN32) || (defined(_WIN64) && _MSC_VER < 1930)
138+
inline void set(int index, Smi value);
139+
#else
138140
inline void set(int index, Smi value) {
139141
DCHECK_NE(map(), GetReadOnlyRoots().fixed_cow_array_map());
140142
DCHECK_LT(static_cast<unsigned>(index), static_cast<unsigned>(length()));
141143
DCHECK(Object(value).IsSmi());
142144
int offset = OffsetOfElementAt(index);
143145
RELAXED_WRITE_FIELD(*this, offset, value);
144146
}
145-
#else
146-
inline void set(int index, Smi value);
147147
#endif
148148

149149
// Setter with explicit barrier mode.

0 commit comments

Comments
 (0)
Please sign in to comment.