Skip to content

Commit 68f8f4b

Browse files
oleavra60814billy
authored andcommitted
deps: V8: cherry-pick 086eecbd96b6
Original commit message: [platform] Add Permission::kNoAccessWillJitLater enum value This value is unused for now. This CL is part 1 of a 3-step dance. Part 2 will be teaching Chrome's Platform implementation to accept the new value. Part 3 will then actually use it in V8. Bug: chromium:1117591 Change-Id: Ie3aed20d4cc58f3def3be2a3a03bba4c3a37bf44 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2450056 Commit-Queue: Jakob Kummerow <jkummerow@chromium.org> Reviewed-by: Michael Lippautz <mlippautz@chromium.org> Cr-Commit-Position: refs/heads/master@{#70335} PR-URL: nodejs#35986 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Michael Dawson <midawson@redhat.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Beth Griggs <bgriggs@redhat.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
1 parent 697d6a0 commit 68f8f4b

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

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.21',
39+
'v8_embedder_string': '-node.22',
4040

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

deps/v8/include/v8-platform.h

+7-1
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,13 @@ class PageAllocator {
338338
kReadWrite,
339339
// TODO(hpayer): Remove this flag. Memory should never be rwx.
340340
kReadWriteExecute,
341-
kReadExecute
341+
kReadExecute,
342+
// Set this when reserving memory that will later require kReadWriteExecute
343+
// permissions. The resulting behavior is platform-specific, currently
344+
// this is used to set the MAP_JIT flag on Apple Silicon.
345+
// TODO(jkummerow): Remove this when Wasm has a platform-independent
346+
// w^x implementation.
347+
kNoAccessWillJitLater
342348
};
343349

344350
/**

deps/v8/test/unittests/heap/unmapper-unittest.cc

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ class TrackingPageAllocator : public ::v8::PageAllocator {
169169
os << " page: [" << start << ", " << end << "), access: ";
170170
switch (access) {
171171
case PageAllocator::kNoAccess:
172+
case PageAllocator::kNoAccessWillJitLater:
172173
os << "--";
173174
break;
174175
case PageAllocator::kRead:

0 commit comments

Comments
 (0)