Skip to content

Commit e87bcc2

Browse files
committed
v8: update to 12.7.224.18
- Update v8.patch - Remove v8_include.patch which is no longer needed - Remove dependency on chromium_base_trace_event_common Signed-off-by: Michael Warres <[email protected]>
1 parent 5753265 commit e87bcc2

File tree

3 files changed

+8
-97
lines changed

3 files changed

+8
-97
lines changed

bazel/external/v8.patch

Lines changed: 5 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
# 1. Disable pointer compression (limits the maximum number of WasmVMs).
22
# 2. Don't expose Wasm C API (only Wasm C++ API).
3-
# 3. Fix gcc build error by disabling nonnull warning.
4-
# 4. Allow compiling v8 on macOS 10.15 to 13.0. TODO(dio): Will remove this patch when https://bugs.chromium.org/p/v8/issues/detail?id=13428 is fixed.
53

64
diff --git a/BUILD.bazel b/BUILD.bazel
7-
index 4e89f90e7e..3fcb38b3f3 100644
5+
index 30be47fa333..d03d1e4d522 100644
86
--- a/BUILD.bazel
97
+++ b/BUILD.bazel
10-
@@ -157,7 +157,7 @@ v8_int(
8+
@@ -220,7 +220,7 @@ v8_int(
119
# If no explicit value for v8_enable_pointer_compression, we set it to 'none'.
1210
v8_string(
1311
name = "v8_enable_pointer_compression",
@@ -16,42 +14,11 @@ index 4e89f90e7e..3fcb38b3f3 100644
1614
)
1715

1816
# Default setting for v8_enable_pointer_compression.
19-
diff --git a/bazel/defs.bzl b/bazel/defs.bzl
20-
index e957c0fad3..063627b72b 100644
21-
--- a/bazel/defs.bzl
22-
+++ b/bazel/defs.bzl
23-
@@ -131,6 +131,7 @@ def _default_args():
24-
"-Wno-redundant-move",
25-
"-Wno-return-type",
26-
"-Wno-stringop-overflow",
27-
+ "-Wno-nonnull",
28-
# Use GNU dialect, because GCC doesn't allow using
29-
# ##__VA_ARGS__ when in standards-conforming mode.
30-
"-std=gnu++17",
31-
@@ -151,6 +152,18 @@ def _default_args():
32-
"-fno-integrated-as",
33-
],
34-
"//conditions:default": [],
35-
+ }) + select({
36-
+ "@v8//bazel/config:is_macos": [
37-
+ # The clang available on macOS catalina has a warning that isn't clean on v8 code.
38-
+ "-Wno-range-loop-analysis",
39-
+
40-
+ # To supress warning on deprecated declaration on v8 code. For example:
41-
+ # external/v8/src/base/platform/platform-darwin.cc:56:22: 'getsectdatafromheader_64'
42-
+ # is deprecated: first deprecated in macOS 13.0.
43-
+ # https://bugs.chromium.org/p/v8/issues/detail?id=13428.
44-
+ "-Wno-deprecated-declarations",
45-
+ ],
46-
+ "//conditions:default": [],
47-
}),
48-
includes = ["include"],
49-
linkopts = select({
5017
diff --git a/src/wasm/c-api.cc b/src/wasm/c-api.cc
51-
index 4473e205c0..65a6ec7e1d 100644
18+
index 2d6d0f6c270..61d071acd52 100644
5219
--- a/src/wasm/c-api.cc
5320
+++ b/src/wasm/c-api.cc
54-
@@ -2247,6 +2247,8 @@ auto Instance::exports() const -> ownvec<Extern> {
21+
@@ -2360,6 +2360,8 @@ auto Instance::exports() const -> ownvec<Extern> {
5522

5623
} // namespace wasm
5724

@@ -60,7 +27,7 @@ index 4473e205c0..65a6ec7e1d 100644
6027
// BEGIN FILE wasm-c.cc
6128

6229
extern "C" {
63-
@@ -3274,3 +3276,5 @@ wasm_instance_t* wasm_frame_instance(const wasm_frame_t* frame) {
30+
@@ -3386,3 +3388,5 @@ wasm_instance_t* wasm_frame_instance(const wasm_frame_t* frame) {
6431
#undef WASM_DEFINE_SHARABLE_REF
6532

6633
} // extern "C"

bazel/external/v8_include.patch

Lines changed: 0 additions & 41 deletions
This file was deleted.

bazel/repositories.bzl

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -161,13 +161,12 @@ def proxy_wasm_cpp_host_repositories():
161161
maybe(
162162
git_repository,
163163
name = "v8",
164-
# 10.7.193.13
165-
commit = "6c8b357a84847a479cd329478522feefc1c3195a",
164+
# 12.7.224.18
165+
commit = "503eb7e9a50b0211f8db54ea362ea06ef56c940d",
166166
remote = "https://chromium.googlesource.com/v8/v8",
167-
shallow_since = "1664374400 +0000",
167+
shallow_since = "1722877350 -0400",
168168
patches = [
169169
"@proxy_wasm_cpp_host//bazel/external:v8.patch",
170-
"@proxy_wasm_cpp_host//bazel/external:v8_include.patch",
171170
],
172171
patch_args = ["-p1"],
173172
)
@@ -177,20 +176,6 @@ def proxy_wasm_cpp_host_repositories():
177176
actual = "@v8//:wee8",
178177
)
179178

180-
maybe(
181-
new_git_repository,
182-
name = "com_googlesource_chromium_base_trace_event_common",
183-
build_file = "@v8//:bazel/BUILD.trace_event_common",
184-
commit = "521ac34ebd795939c7e16b37d9d3ddb40e8ed556",
185-
remote = "https://chromium.googlesource.com/chromium/src/base/trace_event/common.git",
186-
shallow_since = "1662508800 +0000",
187-
)
188-
189-
native.bind(
190-
name = "base_trace_event_common",
191-
actual = "@com_googlesource_chromium_base_trace_event_common//:trace_event_common",
192-
)
193-
194179
# WAMR with dependencies.
195180

196181
maybe(

0 commit comments

Comments
 (0)