summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRefael Ackermann <refack@gmail.com>2019-05-23 12:02:15 -0400
committerRefael Ackermann <refack@gmail.com>2019-06-01 10:00:09 -0400
commitc81bb22bad28defb26ccfdac736e9f155a8ce953 (patch)
treea21853c0d65a61aadf8b2608a28c5527948a608f
parenta6e7d2142489c44426ef0ee839b3ea7b099db730 (diff)
downloadandroid-node-v8-c81bb22bad28defb26ccfdac736e9f155a8ce953.tar.gz
android-node-v8-c81bb22bad28defb26ccfdac736e9f155a8ce953.tar.bz2
android-node-v8-c81bb22bad28defb26ccfdac736e9f155a8ce953.zip
deps: V8: use ATOMIC_VAR_INIT instead of std::atomic_init
`std::atomic_init<size_t>` is not implemented in all platforms. * pragma to ignore `-Wbraced-scalar-init` PR-URL: https://github.com/nodejs/node/pull/27375 Reviewed-By: Michaƫl Zasso <targos@protonmail.com> Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com> Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
-rw-r--r--common.gypi2
-rw-r--r--deps/v8/src/wasm/module-compiler.cc9
2 files changed, 9 insertions, 2 deletions
diff --git a/common.gypi b/common.gypi
index cc7bfd2c9a..e4af01543a 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.8',
+ 'v8_embedder_string': '-node.9',
##### V8 defaults for Node.js #####
diff --git a/deps/v8/src/wasm/module-compiler.cc b/deps/v8/src/wasm/module-compiler.cc
index 568f9eb0f8..6f061e7b5d 100644
--- a/deps/v8/src/wasm/module-compiler.cc
+++ b/deps/v8/src/wasm/module-compiler.cc
@@ -131,7 +131,14 @@ class CompilationUnitQueues {
queues_[task_id].next_steal_task_id_ = next_task_id(task_id);
}
for (auto& atomic_counter : num_units_) {
- std::atomic_init(&atomic_counter, size_t{0});
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wbraced-scalar-init"
+#endif
+ atomic_counter = ATOMIC_VAR_INIT(0);
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
}
}