Skip to content

Commit 7a8976b

Browse files
committed
Update v8.patch to revert v8 commit b26554ec368e9553782012c96aa5e99b163eaff2
This re-adds the use of _allowlist_function_transition, which is needed by Bazel 6.5.0. Signed-off-by: Michael Warres <[email protected]>
1 parent e87bcc2 commit 7a8976b

File tree

1 file changed

+39
-0
lines changed

1 file changed

+39
-0
lines changed

bazel/external/v8.patch

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
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. Revert v8 commit b26554ec368e9553782012c96aa5e99b163eaff2, which removed
4+
# use of _allowlist_function_transition from v8 bazel/defs.bzl, since it is
5+
# still required by the version of Bazel we currently use (6.5.0).
36

47
diff --git a/BUILD.bazel b/BUILD.bazel
58
index 30be47fa333..d03d1e4d522 100644
@@ -14,6 +17,42 @@ index 30be47fa333..d03d1e4d522 100644
1417
)
1518

1619
# Default setting for v8_enable_pointer_compression.
20+
diff --git a/bazel/defs.bzl b/bazel/defs.bzl
21+
index 520a311595e..246c4ecf27a 100644
22+
--- a/bazel/defs.bzl
23+
+++ b/bazel/defs.bzl
24+
@@ -480,6 +480,9 @@ _v8_mksnapshot = rule(
25+
cfg = "exec",
26+
),
27+
"target_os": attr.string(mandatory = True),
28+
+ "_allowlist_function_transition": attr.label(
29+
+ default = "@bazel_tools//tools/allowlists/function_transition_allowlist",
30+
+ ),
31+
"prefix": attr.string(mandatory = True),
32+
"suffix": attr.string(mandatory = True),
33+
},
34+
diff --git a/bazel/v8-non-pointer-compression.bzl b/bazel/v8-non-pointer-compression.bzl
35+
index 8c929454840..57336154cf7 100644
36+
--- a/bazel/v8-non-pointer-compression.bzl
37+
+++ b/bazel/v8-non-pointer-compression.bzl
38+
@@ -47,6 +47,17 @@ v8_binary_non_pointer_compression = rule(
39+
# Note specificaly how it's configured with v8_target_cpu_transition, which
40+
# ensures that setting propagates down the graph.
41+
"binary": attr.label(cfg = v8_disable_pointer_compression),
42+
+ # This is a stock Bazel requirement for any rule that uses Starlark
43+
+ # transitions. It's okay to copy the below verbatim for all such rules.
44+
+ #
45+
+ # The purpose of this requirement is to give the ability to restrict
46+
+ # which packages can invoke these rules, since Starlark transitions
47+
+ # make much larger graphs possible that can have memory and performance
48+
+ # consequences for your build. The whitelist defaults to "everything".
49+
+ # But you can redefine it more strictly if you feel that's prudent.
50+
+ "_allowlist_function_transition": attr.label(
51+
+ default = "@bazel_tools//tools/allowlists/function_transition_allowlist",
52+
+ ),
53+
},
54+
# Making this executable means it works with "$ bazel run".
55+
executable = True,
1756
diff --git a/src/wasm/c-api.cc b/src/wasm/c-api.cc
1857
index 2d6d0f6c270..61d071acd52 100644
1958
--- a/src/wasm/c-api.cc

0 commit comments

Comments
 (0)